Merge "Show correct Wi-Fi status when switching to multi window mode"

2017-03-25 04:14:57 +00:00
parent 84cf0b2a4b 9d12d101be
commit 4cc1f72576
1 changed files with 6 additions and 1 deletions
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -299,6 +299,8 @@ public class WifiSettings extends RestrictedSettingsFragment

        // On/off switch is hidden for Setup Wizard (returns null)
        mWifiEnabler = createWifiEnabler();
+
+        mWifiTracker.startTracking();
    }

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

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

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

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