PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace"

Browse Source
This commit is contained in:
Zoey Chen
2020-02-06 06:11:50 +00:00
committed by Gerrit Code Review
parent 5c262a92de d54004f45e
commit 814b7c40cb
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/security/SimLockPreferenceController.java
View File

@@ -38,7 +38,7 @@ public class SimLockPreferenceController extends BasePreferenceController {
private final CarrierConfigManager mCarrierConfigManager; private final CarrierConfigManager mCarrierConfigManager;
private final UserManager mUserManager; private final UserManager mUserManager;
private final SubscriptionManager mSubscriptionManager; private final SubscriptionManager mSubscriptionManager;
private final TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
public SimLockPreferenceController(Context context) { public SimLockPreferenceController(Context context) {
super(context, KEY_SIM_LOCK); super(context, KEY_SIM_LOCK);
@@ -99,7 +99,9 @@ public class SimLockPreferenceController extends BasePreferenceController {
if (subInfoList != null) { if (subInfoList != null) {
for (SubscriptionInfo subInfo : subInfoList) { for (SubscriptionInfo subInfo : subInfoList) {
if (mTelephonyManager.hasIccCard(subInfo.getSimSlotIndex())) { mTelephonyManager = mTelephonyManager
.createForSubscriptionId(subInfo.getSimSlotIndex());
if (mTelephonyManager.hasIccCard()) {
return true; return true;
} }
} }

3
tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
View File

@@ -141,7 +141,8 @@ public class SimLockPreferenceControllerTest {
final List<SubscriptionInfo> subscriptionInfoList = new ArrayList<>(); final List<SubscriptionInfo> subscriptionInfoList = new ArrayList<>();
SubscriptionInfo info = mock(SubscriptionInfo.class); SubscriptionInfo info = mock(SubscriptionInfo.class);
subscriptionInfoList.add(info); 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))) when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true)))
.thenReturn(subscriptionInfoList); .thenReturn(subscriptionInfoList);
} }