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

am 2613215a: am ab0ea0a2: am 3d32af26: Fix Wifi Settings crash on continuous wifi toggling.

Browse Source 
* commit '2613215a6fdc683302fd6177ac10bd00736861c9':
  Fix Wifi Settings crash on continuous wifi toggling.
This commit is contained in:
Sanket Padawe
2015-06-03 22:36:06 +00:00
committed by Android Git Automerger
parent 50376382df 2613215a6f
commit 6eb55f64ad
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() {
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()));