Merge "Revert "Ignore the WiFi network callbacks if they are not default"" into sc-dev (eaf1d09c) · Commits · e / os / android_frameworks_base

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -80,9 +80,6 @@ public class WifiStatusTracker {
		@Override
		public void onCapabilitiesChanged(
		Network network, NetworkCapabilities networkCapabilities) {
		if (mDefaultNetwork != null && mDefaultNetwork.getNetId() != network.getNetId()) {
		return;
		}
		if (!mNetworks.contains(network.getNetId())) {
		// New network
		boolean isVcnOverWifi =
		@@ -117,9 +114,6 @@ public class WifiStatusTracker {

		@Override
		public void onLost(Network network) {
		if (mDefaultNetwork != null && mDefaultNetwork.getNetId() != network.getNetId()) {
		return;
		}
		String log = new StringBuilder()
		.append(SSDF.format(System.currentTimeMillis())).append(",")
		.append("onLost: ")

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

+12 −13

Original line number	Diff line number	Diff line
		@@ -129,7 +129,6 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
		protected int mSubId;

		private NetworkCapabilities mNetCapabilities;
		private Network mNetwork;
		private ConnectivityManager.NetworkCallback mDefaultCallbackInWifiTracker;
		private ConnectivityManager.NetworkCallback mDefaultCallbackInNetworkController;
		private ConnectivityManager.NetworkCallback mNetworkCallback;
		@@ -174,10 +173,8 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
		mMockCm = mock(ConnectivityManager.class);
		mMockBd = mock(BroadcastDispatcher.class);
		mMockNsm = mock(NetworkScoreManager.class);
		mNetwork = mock(Network.class);
		mMockSubDefaults = mock(SubscriptionDefaults.class);
		mNetCapabilities = new NetworkCapabilities();
		when(mNetwork.getNetId()).thenReturn(0);
		when(mMockTm.isDataCapable()).thenReturn(true);
		when(mMockTm.createForSubscriptionId(anyInt())).thenReturn(mMockTm);
		doAnswer(invocation -> {
		@@ -326,7 +323,8 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
		new NetworkCapabilities.Builder(mNetCapabilities);
		builder.setTransportInfo(info);
		setConnectivityCommon(builder, networkType, validated, isConnected);
		mDefaultCallbackInNetworkController.onCapabilitiesChanged(mNetwork, builder.build());
		mDefaultCallbackInNetworkController.onCapabilitiesChanged(
		mock(Network.class), builder.build());
		}

		public void setConnectivityViaCallbackInNetworkController(
		@@ -337,7 +335,8 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
		builder.setTransportInfo(wifiInfo);
		}
		setConnectivityCommon(builder, networkType, validated, isConnected);
		mDefaultCallbackInNetworkController.onCapabilitiesChanged(mNetwork, builder.build());
		mDefaultCallbackInNetworkController.onCapabilitiesChanged(
		mock(Network.class), builder.build());
		}

		public void setConnectivityViaCallbackInWifiTracker(
		@@ -351,10 +350,10 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
		if (networkType == NetworkCapabilities.TRANSPORT_WIFI) {
		if (isConnected) {
		final NetworkCapabilities newCap = builder.build();
		mNetworkCallback.onAvailable(mNetwork);
		mNetworkCallback.onCapabilitiesChanged(mNetwork, newCap);
		mNetworkCallback.onAvailable(mock(Network.class));
		mNetworkCallback.onCapabilitiesChanged(mock(Network.class), newCap);
		} else {
		mNetworkCallback.onLost(mNetwork);
		mNetworkCallback.onLost(mock(Network.class));
		}
		}
		}
		@@ -368,11 +367,11 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
		if (networkType == NetworkCapabilities.TRANSPORT_CELLULAR) {
		if (isConnected) {
		final NetworkCapabilities newCap = builder.build();
		mNetworkCallback.onAvailable(mNetwork);
		mNetworkCallback.onCapabilitiesChanged(mNetwork, newCap);
		mDefaultCallbackInWifiTracker.onCapabilitiesChanged(mNetwork, newCap);
		mNetworkCallback.onAvailable(mock(Network.class));
		mNetworkCallback.onCapabilitiesChanged(mock(Network.class), newCap);
		mDefaultCallbackInWifiTracker.onCapabilitiesChanged(mock(Network.class), newCap);
		} else {
		mNetworkCallback.onLost(mNetwork);
		mNetworkCallback.onLost(mock(Network.class));
		}
		}
		}
		@@ -386,7 +385,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
		}
		setConnectivityCommon(builder, networkType, validated, isConnected);
		mDefaultCallbackInWifiTracker.onCapabilitiesChanged(
		mNetwork, builder.build());
		mock(Network.class), builder.build());
		}

		private static void setConnectivityCommon(NetworkCapabilities.Builder builder,