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

Fix Wifi Settings crash on continuous wifi toggling.

Browse Source 
Bug: 21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60
This commit is contained in:
Sanket Padawe
2015-06-03 14:16:13 -07:00
parent fb619a8726
commit 3d32af2642
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -816,7 +816,8 @@ public class WifiSettings extends RestrictedSettingsFragment
/* package */ void forget() { /* package */ void forget() {
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORGET); MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORGET);
if (!mSelectedAccessPoint.isSaved()) { 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. // Network is active but has no network ID - must be ephemeral.
mWifiManager.disableEphemeralNetwork( mWifiManager.disableEphemeralNetwork(
AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsid())); AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsid()));