Merge "Show correct Wi-Fi status when switching to multi window mode" am: 4cc1f72576 am: a4def43fad (f52128f7) · Commits · e / os / android_packages_apps_Settings

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -335,6 +335,8 @@ public class WifiSettings extends RestrictedSettingsFragment

		// On/off switch is hidden for Setup Wizard (returns null)
		mWifiEnabler = createWifiEnabler();

		mWifiTracker.startTracking();
		}

		/**
		@@ -354,7 +356,6 @@ public class WifiSettings extends RestrictedSettingsFragment
		mWifiEnabler.resume(activity);
		}

		mWifiTracker.startTracking();
		activity.invalidateOptionsMenu();
		}

		@@ -364,7 +365,11 @@ public class WifiSettings extends RestrictedSettingsFragment
		if (mWifiEnabler != null) {
		mWifiEnabler.pause();
		}
		}

		@Override
		public void onStop() {
		super.onStop();
		mWifiTracker.stopTracking();
		}