From 73038f556d4b0d0d2612ae44a97bcc12866e3376 Mon Sep 17 00:00:00 2001 From: zoey chen Date: Tue, 10 Dec 2019 17:44:05 +0800 Subject: [PATCH] [Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace Bug: 145967955 Test: make Change-Id: I8b948d1d416e1eb79e34be073b8ad81645d5ebb1 --- .../settings/security/SimLockPreferenceController.java | 6 ++++-- .../settings/security/SimLockPreferenceControllerTest.java | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java index d4def6bedb4..3b23daa1e88 100644 --- a/src/com/android/settings/security/SimLockPreferenceController.java +++ b/src/com/android/settings/security/SimLockPreferenceController.java @@ -38,7 +38,7 @@ public class SimLockPreferenceController extends BasePreferenceController { private final CarrierConfigManager mCarrierConfigManager; private final UserManager mUserManager; private final SubscriptionManager mSubscriptionManager; - private final TelephonyManager mTelephonyManager; + private TelephonyManager mTelephonyManager; public SimLockPreferenceController(Context context) { super(context, KEY_SIM_LOCK); @@ -99,7 +99,9 @@ public class SimLockPreferenceController extends BasePreferenceController { if (subInfoList != null) { for (SubscriptionInfo subInfo : subInfoList) { - if (mTelephonyManager.hasIccCard(subInfo.getSimSlotIndex())) { + mTelephonyManager = mTelephonyManager + .createForSubscriptionId(subInfo.getSimSlotIndex()); + if (mTelephonyManager.hasIccCard()) { return true; } } diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index 0ae33a0b5ca..ebafcebee7d 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -141,7 +141,8 @@ public class SimLockPreferenceControllerTest { final List subscriptionInfoList = new ArrayList<>(); SubscriptionInfo info = mock(SubscriptionInfo.class); subscriptionInfoList.add(info); - when(mTelephonyManager.hasIccCard(anyInt())).thenReturn(true); + when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager); + when(mTelephonyManager.hasIccCard()).thenReturn(true); when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))) .thenReturn(subscriptionInfoList); }