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

Commit 64a51f12 authored by kaiyiz's avatar kaiyiz Committed by Gerrit - the friendly Code Review server
Browse files

Settings: Fix FC issue when add VPN. 

The cause is NullPointerException. Two vpn dialog will be shown
when double click the + icon to add vpn. The parameter mDialog
is set to null after clicking save button. Then
NullPointerException exists when click the save button in the
second vpn dialog.

Vpn dialog is shown only when the parameter mDialog is null, then
there is only one vpn dialog at the same time.

CRs-Fixed: 800473
Change-Id: I8161278adf740a8e46f54713e6847adb1cff623e
parent 5cece766

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

+6 −4
Original line number Diff line number Diff line
@@ -142,10 +142,12 @@ public class VpnSettings extends SettingsPreferenceFragment implements 
                while (mPreferences.containsKey(Long.toHexString(millis))) {

                    ++millis;

                }

                if (mDialog == null) {

                    mDialog = new VpnDialog(

                            getActivity(), this, new VpnProfile(Long.toHexString(millis)), true);

                    mDialog.setOnDismissListener(this);

                    mDialog.show();

                }

                return true;

            }

            case R.id.vpn_lockdown: {