From 71844d18b32d2c40f51c7f2f633e9387ec25ce50 Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Fri, 28 Feb 2020 16:56:12 -0800 Subject: Make IccCardConstants APIs hidden as per API concil's feedback This CL uses altenate API for WiFi For rest of the external components, we will fix in S Bug: 147320577 Test: atest frameworks/opt/net/wifi/tests/wifitests Change-Id: I8d54411cad6e8f61697095fa2fd6baed63fe4ce8 --- .../src/com/android/server/wifi/WifiServiceImplTest.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java index f1e515b9c..389df5ae0 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java @@ -148,7 +148,6 @@ import android.telephony.TelephonyManager; import androidx.test.filters.SmallTest; import com.android.internal.os.PowerProfile; -import com.android.internal.telephony.TelephonyIntents; import com.android.internal.util.AsyncChannel; import com.android.server.wifi.WifiServiceImpl.LocalOnlyRequestorCallback; import com.android.server.wifi.hotspot2.PasspointManager; @@ -3791,11 +3790,11 @@ public class WifiServiceImplTest extends WifiBaseTest { mLooper.dispatchAll(); verify(mContext).registerReceiver(mBroadcastReceiverCaptor.capture(), (IntentFilter) argThat((IntentFilter filter) -> - filter.hasAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED))); + filter.hasAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED))); int userHandle = TEST_USER_HANDLE; // Send the broadcast - Intent intent = new Intent(TelephonyIntents.ACTION_SIM_STATE_CHANGED); + Intent intent = new Intent(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED); intent.putExtra(Intent.EXTRA_USER_HANDLE, userHandle); mBroadcastReceiverCaptor.getValue().onReceive(mContext, intent); verifyNoMoreInteractions(mWifiCountryCode); @@ -3810,14 +3809,13 @@ public class WifiServiceImplTest extends WifiBaseTest { mLooper.dispatchAll(); verify(mContext).registerReceiver(mBroadcastReceiverCaptor.capture(), (IntentFilter) argThat((IntentFilter filter) -> - filter.hasAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED))); + filter.hasAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED))); int userHandle = TEST_USER_HANDLE; // Send the broadcast - Intent intent = new Intent(TelephonyIntents.ACTION_SIM_STATE_CHANGED); + Intent intent = new Intent(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED); intent.putExtra(Intent.EXTRA_USER_HANDLE, userHandle); - intent.putExtra(Intent.EXTRA_REBROADCAST_ON_UNLOCK, true); - intent.putExtra(Intent.EXTRA_SIM_STATE, Intent.SIM_STATE_ABSENT); + intent.putExtra(TelephonyManager.EXTRA_SIM_STATE, Intent.SIM_STATE_ABSENT); mBroadcastReceiverCaptor.getValue().onReceive(mContext, intent); verifyNoMoreInteractions(mWifiCountryCode); } -- cgit v1.2.3