Merge "Register NetworkRequest callbacks with a handler" into pi-dev (8ee96517) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -41,8 +41,9 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback {
		private final WifiManager mWifiManager;
		private final NetworkScoreManager mNetworkScoreManager;
		private final ConnectivityManager mConnectivityManager;
		private final Handler mHandler = new Handler(Looper.getMainLooper());
		private final WifiNetworkScoreCache.CacheListener mCacheListener =
		new WifiNetworkScoreCache.CacheListener(new Handler(Looper.getMainLooper())) {
		new WifiNetworkScoreCache.CacheListener(mHandler) {
		@Override
		public void networkCacheUpdated(List<ScoredNetwork> updatedNetworks) {
		updateStatusLabel();
		@@ -89,7 +90,8 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback {
		mNetworkScoreManager.registerNetworkScoreCache(NetworkKey.TYPE_WIFI,
		mWifiNetworkScoreCache, NetworkScoreManager.CACHE_FILTER_CURRENT_NETWORK);
		mWifiNetworkScoreCache.registerListener(mCacheListener);
		mConnectivityManager.registerNetworkCallback(mNetworkRequest, mNetworkCallback);
		mConnectivityManager.registerNetworkCallback(
		mNetworkRequest, mNetworkCallback, mHandler);
		} else {
		mNetworkScoreManager.unregisterNetworkScoreCache(NetworkKey.TYPE_WIFI,
		mWifiNetworkScoreCache);

+3 −2

Original line number	Diff line number	Diff line
		@@ -313,7 +313,8 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
		mContext.registerReceiver(mReceiver, mFilter, null /* permission */, mWorkHandler);
		// NetworkCallback objects cannot be reused. http://b/20701525 .
		mNetworkCallback = new WifiTrackerNetworkCallback();
		mConnectivityManager.registerNetworkCallback(mNetworkRequest, mNetworkCallback);
		mConnectivityManager.registerNetworkCallback(
		mNetworkRequest, mNetworkCallback, mWorkHandler);
		mRegistered = true;
		}
		}
		@@ -788,7 +789,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
		// We don't send a NetworkInfo object along with this message, because even if we
		// fetch one from ConnectivityManager, it might be older than the most recent
		// NetworkInfo message we got via a WIFI_STATE_CHANGED broadcast.
		mWorkHandler.post(() -> updateNetworkInfo(null));
		updateNetworkInfo(null);
		}
		}
		}