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

Merge "Show correct Wi-Fi status when switching to multi window mode" am: 4cc1f72576 am: a4def43fad

Browse Source 
am: 76fb361b9d

Change-Id: Ib19926feb7d3a2da0a8aaa9dc9c5ee3bcae6c2af
This commit is contained in:
Zhihong Li
2017-03-25 04:26:06 +00:00
committed by android-build-merger
parent f4004ce808 76fb361b9d
commit f52128f7cb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,6 +335,8 @@ public class WifiSettings extends RestrictedSettingsFragment
// On/off switch is hidden for Setup Wizard (returns null) // On/off switch is hidden for Setup Wizard (returns null)
mWifiEnabler = createWifiEnabler(); mWifiEnabler = createWifiEnabler();
mWifiTracker.startTracking();
} }
/** /**
@@ -354,7 +356,6 @@ public class WifiSettings extends RestrictedSettingsFragment
mWifiEnabler.resume(activity); mWifiEnabler.resume(activity);
} }
mWifiTracker.startTracking();
activity.invalidateOptionsMenu(); activity.invalidateOptionsMenu();
} }
@@ -364,7 +365,11 @@ public class WifiSettings extends RestrictedSettingsFragment
if (mWifiEnabler != null) { if (mWifiEnabler != null) {
mWifiEnabler.pause(); mWifiEnabler.pause();
} }
}
@Override
public void onStop() {
super.onStop();
mWifiTracker.stopTracking(); mWifiTracker.stopTracking();
} }