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

Commit 3d32af26 authored by Sanket Padawe's avatar Sanket Padawe
Browse files

Fix Wifi Settings crash on continuous wifi toggling. 

Bug: 21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60
parent fb619a87

src/com/android/settings/wifi/WifiSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -816,7 +816,8 @@ public class WifiSettings extends RestrictedSettingsFragment 
    /* package */ void forget() {

        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORGET);

        if (!mSelectedAccessPoint.isSaved()) {

            if (mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {

            if (mSelectedAccessPoint.getNetworkInfo() != null &&

                    mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {

                // Network is active but has no network ID - must be ephemeral.

                mWifiManager.disableEphemeralNetwork(

                        AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsid()));