Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88b01402 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Precreate a data structure so it's never null. 

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

Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
parent 49dc9825

src/com/android/settings/vpn2/VpnSettings.java

+2 −3
Original line number Diff line number Diff line
@@ -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();