diff options
11 files changed, 76 insertions, 66 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java index b1e14346c3fa..d52a25139ce7 100644 --- a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java +++ b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java @@ -22,8 +22,8 @@ import static android.telephony.PhoneStateListener.LISTEN_NONE; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageManager; import android.content.res.Resources; -import android.net.ConnectivityManager; import android.net.wifi.WifiManager; import android.os.Handler; import android.telephony.PhoneStateListener; @@ -179,8 +179,8 @@ public class CarrierTextController { mBgHandler = new Handler(Dependency.get(Dependency.BG_LOOPER)); mKeyguardUpdateMonitor = Dependency.get(KeyguardUpdateMonitor.class); mBgHandler.post(() -> { - boolean supported = ConnectivityManager.from(mContext).isNetworkSupported( - ConnectivityManager.TYPE_MOBILE); + boolean supported = + mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY); if (supported && mNetworkSupported.compareAndSet(false, supported)) { // This will set/remove the listeners appropriately. Note that it will never double // add the listeners. diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 461a7303c184..553e5a7c6d7d 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -50,6 +50,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; +import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.content.res.ColorStateList; import android.content.res.Configuration; @@ -356,7 +357,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, filter.addAction(TelephonyManager.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED); mBroadcastDispatcher.registerReceiver(mBroadcastReceiver, filter); - mHasTelephony = connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE); + mHasTelephony = + context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY); // get notified of phone state changes telephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java index 2aba1038a97d..cc7a4f836c63 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java @@ -16,7 +16,6 @@ package com.android.systemui.statusbar; import android.content.Context; import android.graphics.Rect; -import android.net.ConnectivityManager; import android.os.Bundle; import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; @@ -123,8 +122,7 @@ public class OperatorNameView extends TextView implements DemoModeCommandReceive .getValue(KEY_SHOW_OPERATOR_NAME, 1) != 0; setVisibility(showOperatorName ? VISIBLE : GONE); - boolean hasMobile = ConnectivityManager.from(mContext) - .isNetworkSupported(ConnectivityManager.TYPE_MOBILE); + boolean hasMobile = mContext.getSystemService(TelephonyManager.class).isDataCapable(); boolean airplaneMode = WirelessUtils.isAirplaneModeOn(mContext); if (!hasMobile || airplaneMode) { setText(null); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EmergencyCryptkeeperText.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/EmergencyCryptkeeperText.java index 5dc91047770d..f2ee85886dca 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EmergencyCryptkeeperText.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/EmergencyCryptkeeperText.java @@ -21,7 +21,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.net.ConnectivityManager; import android.provider.Settings; import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; @@ -95,8 +94,7 @@ public class EmergencyCryptkeeperText extends TextView { } public void update() { - boolean hasMobile = ConnectivityManager.from(mContext) - .isNetworkSupported(ConnectivityManager.TYPE_MOBILE); + boolean hasMobile = mContext.getSystemService(TelephonyManager.class).isDataCapable(); boolean airplaneMode = (Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0) == 1); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index db039b44d91a..8a8602142363 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -79,6 +79,7 @@ import java.io.FileDescriptor; import java.io.PrintWriter; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.BitSet; import java.util.Collections; import java.util.Comparator; @@ -241,8 +242,7 @@ public class NetworkControllerImpl extends BroadcastReceiver mSubscriptionManager = subManager; mSubDefaults = defaultsHandler; mConnectivityManager = connectivityManager; - mHasMobileDataFeature = - mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE); + mHasMobileDataFeature = telephonyManager.isDataCapable(); mDemoModeController = demoModeController; // telephony @@ -337,10 +337,19 @@ public class NetworkControllerImpl extends BroadcastReceiver // This callback is invoked a lot (i.e. when RSSI changes), so avoid updating // icons when connectivity state has remained the same. - if (network.equals(mLastNetwork) && - networkCapabilities.equalsTransportTypes(mLastNetworkCapabilities) && - validated == lastValidated) { - return; + if (network.equals(mLastNetwork) && validated == lastValidated) { + // Should not rely on getTransportTypes() returning the same order of transport + // types. So sort the array before comparing. + int[] newTypes = networkCapabilities.getTransportTypes(); + Arrays.sort(newTypes); + + int[] lastTypes = (mLastNetworkCapabilities != null) + ? mLastNetworkCapabilities.getTransportTypes() : null; + if (lastTypes != null) Arrays.sort(lastTypes); + + if (Arrays.equals(newTypes, lastTypes)) { + return; + } } mLastNetwork = network; mLastNetworkCapabilities = networkCapabilities; @@ -430,14 +439,13 @@ public class NetworkControllerImpl extends BroadcastReceiver filter.addAction(Intent.ACTION_SERVICE_STATE); filter.addAction(TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED); filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); - filter.addAction(ConnectivityManager.INET_CONDITION_ACTION); filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED); filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED); mBroadcastDispatcher.registerReceiverWithHandler(this, filter, mReceiverHandler); mListening = true; // Initial setup of connectivity. Handled as if we had received a sticky broadcast of - // ConnectivityManager.CONNECTIVITY_ACTION or ConnectivityManager.INET_CONDITION_ACTION. + // ConnectivityManager.CONNECTIVITY_ACTION. mReceiverHandler.post(this::updateConnectivity); // Initial setup of WifiSignalController. Handled as if we had received a sticky broadcast @@ -682,7 +690,6 @@ public class NetworkControllerImpl extends BroadcastReceiver final String action = intent.getAction(); switch (action) { case ConnectivityManager.CONNECTIVITY_ACTION: - case ConnectivityManager.INET_CONDITION_ACTION: updateConnectivity(); break; case Intent.ACTION_AIRPLANE_MODE_CHANGED: diff --git a/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java index aa4122fd190a..6f2c0af5384d 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.net.ConnectivityManager; +import android.content.pm.PackageManager; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Handler; @@ -99,7 +99,7 @@ public class CarrierTextControllerTest extends SysuiTestCase { @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor; @Mock - private ConnectivityManager mConnectivityManager; + private PackageManager mPackageManager; @Mock private TelephonyManager mTelephonyManager; @Mock @@ -123,8 +123,8 @@ public class CarrierTextControllerTest extends SysuiTestCase { mTestableLooper = TestableLooper.get(this); mContext.addMockSystemService(WifiManager.class, mWifiManager); - mContext.addMockSystemService(ConnectivityManager.class, mConnectivityManager); - when(mConnectivityManager.isNetworkSupported(anyInt())).thenReturn(true); + mContext.addMockSystemService(PackageManager.class, mPackageManager); + when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)).thenReturn(true); mContext.addMockSystemService(TelephonyManager.class, mTelephonyManager); mContext.addMockSystemService(SubscriptionManager.class, mSubscriptionManager); mContext.getOrCreateTestableResources().addOverride( diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java index 999d2822c928..8f36415d60af 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java @@ -35,7 +35,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Instrumentation; -import android.content.Intent; import android.net.ConnectivityManager; import android.net.LinkProperties; import android.net.Network; @@ -54,7 +53,6 @@ import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; -import android.telephony.TelephonyCallback; import android.telephony.TelephonyDisplayInfo; import android.telephony.TelephonyManager; import android.testing.TestableLooper; @@ -172,7 +170,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { mMockNsm = mock(NetworkScoreManager.class); mMockSubDefaults = mock(SubscriptionDefaults.class); mNetCapabilities = new NetworkCapabilities(); - when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true); + when(mMockTm.isDataCapable()).thenReturn(true); when(mMockTm.createForSubscriptionId(anyInt())).thenReturn(mMockTm); doAnswer(invocation -> { int rssi = invocation.getArgument(0); @@ -285,7 +283,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { } protected NetworkControllerImpl setUpNoMobileData() { - when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false); + when(mMockTm.isDataCapable()).thenReturn(false); NetworkControllerImpl networkControllerNoMobile = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockNsm, mMockSm, mConfig, TestableLooper.get(this).getLooper(), mCallbackHandler, @@ -308,27 +306,14 @@ public class NetworkControllerBaseTest extends SysuiTestCase { TelephonyManager.NETWORK_TYPE_UMTS); setConnectivityViaCallbackInNetworkController( NetworkCapabilities.TRANSPORT_CELLULAR, true, true, null); - setConnectivityViaBroadcast( - NetworkCapabilities.TRANSPORT_CELLULAR, true, true); } - public void setConnectivityViaBroadcastForVcn( + public void setConnectivityViaCallbackInNetworkControllerForVcn( int networkType, boolean validated, boolean isConnected, VcnTransportInfo info) { mNetCapabilities.setTransportInfo(info); setConnectivityCommon(networkType, validated, isConnected); mDefaultCallbackInNetworkController.onCapabilitiesChanged( mock(Network.class), new NetworkCapabilities(mNetCapabilities)); - Intent i = new Intent(ConnectivityManager.INET_CONDITION_ACTION); - mNetworkController.onReceive(mContext, i); - } - - public void setConnectivityViaBroadcast( - int networkType, boolean validated, boolean isConnected) { - setConnectivityCommon(networkType, validated, isConnected); - mDefaultCallbackInNetworkController.onCapabilitiesChanged( - mock(Network.class), new NetworkCapabilities(mNetCapabilities)); - Intent i = new Intent(ConnectivityManager.INET_CONDITION_ACTION); - mNetworkController.onReceive(mContext, i); } public void setConnectivityViaCallbackInNetworkController( diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java index 37b6a5dc1fde..b108dd817bde 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java @@ -126,7 +126,8 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { when(mMockTm.isDataConnectionAllowed()).thenReturn(false); setupDefaultSignal(); updateDataConnectionState(TelephonyManager.DATA_CONNECTED, 0); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); // Verify that a SignalDrawable with a cut out is used to display data disabled. verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, 0, @@ -140,7 +141,8 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { when(mMockTm.isDataConnectionAllowed()).thenReturn(false); setupDefaultSignal(); updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); // Verify that a SignalDrawable with a cut out is used to display data disabled. verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, 0, @@ -155,7 +157,8 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { setupDefaultSignal(); setDefaultSubId(mSubId + 1); updateDataConnectionState(TelephonyManager.DATA_CONNECTED, 0); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); // Verify that a SignalDrawable with a cut out is used to display data disabled. verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, 0, @@ -170,7 +173,8 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { setupDefaultSignal(); setDefaultSubId(mSubId + 1); updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); // Verify that a SignalDrawable with a cut out is used to display data disabled. verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, 0, @@ -184,7 +188,8 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { when(mMockTm.isDataConnectionAllowed()).thenReturn(false); setupDefaultSignal(); updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); when(mMockProvisionController.isUserSetup(anyInt())).thenReturn(false); mUserCallback.onUserSetupChanged(); TestableLooper.get(this).processAllMessages(); @@ -206,7 +211,8 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { mConfig.alwaysShowDataRatIcon = true; mNetworkController.handleConfigurationChanged(); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, TelephonyIcons.ICON_G, true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, false); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerEthernetTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerEthernetTest.java index 93cf3e8317ce..6aab9c762a95 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerEthernetTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerEthernetTest.java @@ -37,7 +37,8 @@ public class NetworkControllerEthernetTest extends NetworkControllerBaseTest { } protected void setEthernetState(boolean connected, boolean validated) { - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_ETHERNET, validated, connected); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_ETHERNET, validated, connected, null); } protected void verifyLastEthernetIcon(boolean visible, int icon) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java index c0d9c3dc00a6..91e9f0622cbf 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Intent; -import android.net.ConnectivityManager; import android.net.NetworkCapabilities; +import android.net.wifi.WifiInfo; import android.os.Handler; import android.os.Looper; import android.telephony.CellSignalStrength; @@ -59,7 +59,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { @Test public void testNoIconWithoutMobile() { // Turn off mobile network support. - when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false); + when(mMockTm.isDataCapable()).thenReturn(false); // Create a new NetworkController as this is currently handled in constructor. mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockNsm, mMockSm, mConfig, Looper.getMainLooper(), mCallbackHandler, @@ -145,7 +145,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { @Test public void testNoSimlessIconWithoutMobile() { // Turn off mobile network support. - when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false); + when(mMockTm.isDataCapable()).thenReturn(false); // Create a new NetworkController as this is currently handled in constructor. mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockNsm, mMockSm, mConfig, Looper.getMainLooper(), mCallbackHandler, @@ -172,7 +172,8 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { testStrength, DEFAULT_ICON); // Verify low inet number indexing. - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, true); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_CELLULAR, false, true, null); verifyLastMobileDataIndicators(true, testStrength, DEFAULT_ICON, false, false); } @@ -259,8 +260,10 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { @Test public void testNoBangWithWifi() { setupDefaultSignal(); - setConnectivityViaBroadcast(mMobileSignalController.mTransportType, false, false); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_WIFI, true, true); + setConnectivityViaCallbackInNetworkController( + mMobileSignalController.mTransportType, false, false, null); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_WIFI, true, true, mock(WifiInfo.class)); verifyLastMobileDataIndicators(false, DEFAULT_LEVEL, 0); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java index 092c1168b5ae..ab7cbf77f5ee 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java @@ -59,9 +59,11 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) { setWifiLevel(testLevel); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_WIFI, true, true); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_WIFI, true, true, mWifiInfo); verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_WIFI, false, true); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_WIFI, false, true, mWifiInfo); // Icon does not show if not validated verifyLastWifiIcon(false, WifiIcons.WIFI_SIGNAL_STRENGTH[0][testLevel]); } @@ -80,12 +82,14 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { setWifiState(true, testSsid); for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) { setWifiLevel(testLevel); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_WIFI, true, true); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_WIFI, true, true, mWifiInfo); setConnectivityViaDefaultCallbackInWifiTracker( NetworkCapabilities.TRANSPORT_WIFI, true, true, mWifiInfo); verifyLastQsWifiIcon(true, true, WifiIcons.QS_WIFI_SIGNAL_STRENGTH[1][testLevel], testSsid); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_WIFI, false, true); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_WIFI, false, true, mWifiInfo); verifyLastQsWifiIcon(true, true, WifiIcons.QS_WIFI_SIGNAL_STRENGTH[0][testLevel], testSsid); } @@ -99,7 +103,8 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { setWifiEnabled(true); setWifiState(true, testSsid); setWifiLevel(testLevel); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_WIFI, true, true); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_WIFI, true, true, mWifiInfo); setConnectivityViaDefaultCallbackInWifiTracker( NetworkCapabilities.TRANSPORT_WIFI, true, true, mWifiInfo); verifyLastQsWifiIcon(true, true, @@ -126,14 +131,17 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { setWifiEnabled(true); setWifiState(true, testSsid); setWifiLevel(testLevel); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_WIFI, true, true); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_WIFI, true, true, mWifiInfo); verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]); setupDefaultSignal(); setGsmRoaming(true); // Still be on wifi though. - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_WIFI, true, true); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_WIFI, true, true, mWifiInfo); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); verifyLastMobileDataIndicators(true, DEFAULT_LEVEL, 0, true); } @@ -145,7 +153,8 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { setWifiEnabled(true); setWifiState(true, testSsid); setWifiLevel(testLevel); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_WIFI, true, true); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_WIFI, true, true, mWifiInfo); verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]); setConnectivityViaCallbackInNetworkController( @@ -161,7 +170,8 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { setWifiEnabled(true); setWifiState(true, testSsid); setWifiLevel(testLevel); - setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_WIFI, true, true); + setConnectivityViaCallbackInNetworkController( + NetworkCapabilities.TRANSPORT_WIFI, true, true, mWifiInfo); verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]); setWifiState(false, testSsid); @@ -234,11 +244,11 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) { setWifiLevelForVcn(testLevel); - setConnectivityViaBroadcastForVcn( + setConnectivityViaCallbackInNetworkControllerForVcn( NetworkCapabilities.TRANSPORT_CELLULAR, true, true, mVcnTransportInfo); verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, true); - setConnectivityViaBroadcastForVcn( + setConnectivityViaCallbackInNetworkControllerForVcn( NetworkCapabilities.TRANSPORT_CELLULAR, false, true, mVcnTransportInfo); verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, false); } |