Merge "Remove hidden onAvailable callback override" into sc-dev (a95de94f) · Commits · e / os / android_frameworks_base

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

+12 −15

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ import android.content.Context;
		import android.content.Intent;
		import android.net.ConnectivityManager;
		import android.net.ConnectivityManager.NetworkCallback;
		import android.net.LinkProperties;
		import android.net.Network;
		import android.net.NetworkCapabilities;
		import android.net.NetworkInfo;
		@@ -77,10 +76,13 @@ public class WifiStatusTracker {
		.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR).build();
		private final NetworkCallback mNetworkCallback =
		new NetworkCallback(NetworkCallback.FLAG_INCLUDE_LOCATION_INFO) {
		// Note: onCapabilitiesChanged is guaranteed to be called "immediately" after onAvailable
		// and onLinkPropertiesChanged.
		@Override
		public void onAvailable(
		Network network, NetworkCapabilities networkCapabilities,
		LinkProperties linkProperties, boolean blocked) {
		public void onCapabilitiesChanged(
		Network network, NetworkCapabilities networkCapabilities) {
		if (!mNetworks.contains(network.getNetId())) {
		// New network
		boolean isVcnOverWifi =
		networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
		&& (Utils.tryGetWifiInfoForVcn(networkCapabilities) != null);
		@@ -91,11 +93,6 @@ public class WifiStatusTracker {
		}
		}

		// Note: onCapabilitiesChanged is guaranteed to be called "immediately" after onAvailable
		// and onLinkPropertiesChanged.
		@Override
		public void onCapabilitiesChanged(
		Network network, NetworkCapabilities networkCapabilities) {
		WifiInfo wifiInfo = null;
		if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
		wifiInfo = Utils.tryGetWifiInfoForVcn(networkCapabilities);