Merge "Handle network info updates while scanning is paused" into mnc-dev (f3edbb55) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+12 −10

Original line number	Diff line number	Diff line
		@@ -357,6 +357,7 @@ public class WifiTracker {
		}

		private void updateNetworkInfo(NetworkInfo networkInfo) {
		if (mScanner != null) {
		/* sticky broadcasts can call this when wifi is disabled */
		if (!mWifiManager.isWifiEnabled()) {
		mScanner.pause();
		@@ -369,6 +370,7 @@ public class WifiTracker {
		} else {
		mScanner.resume();
		}
		}

		mLastInfo = mWifiManager.getConnectionInfo();
		if (networkInfo != null) {