From 88b0140241c646c87d356748621cef28a3105466 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Thu, 27 Sep 2012 11:21:12 -0700
Subject: [PATCH] Precreate a data structure so it's never null.

Fixes NPE that the fast-fingered monkey sometimes triggers.
bug:7084178

Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
---
 src/com/android/settings/vpn2/VpnSettings.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index de7c034d13f..9d154358bf0 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -73,7 +73,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
     private final KeyStore mKeyStore = KeyStore.getInstance();
     private boolean mUnlocking = false;
 
-    private HashMap<String, VpnPreference> mPreferences;
+    private HashMap<String, VpnPreference> mPreferences = new HashMap<String, VpnPreference>();
     private VpnDialog mDialog;
 
     private Handler mUpdater;
@@ -173,8 +173,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
         // Currently we are the only user of profiles in KeyStore.
         // Assuming KeyStore and KeyGuard do the right thing, we can
         // safely cache profiles in the memory.
-        if (mPreferences == null) {
-            mPreferences = new HashMap<String, VpnPreference>();
+        if (mPreferences.size() == 0) {
             PreferenceGroup group = getPreferenceScreen();
 
             final Context context = getActivity();