PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Precreate a data structure so it's never null.

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

Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
This commit is contained in:
Robert Greenwalt
2012-09-27 11:21:12 -07:00
parent 49dc982556
commit 88b0140241
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/vpn2/VpnSettings.java
View File

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