diff options
| author | changbetty <changbetty@google.com> | 2020-01-07 11:29:14 +0800 |
|---|---|---|
| committer | changbetty <changbetty@google.com> | 2020-01-08 12:01:17 +0800 |
| commit | db816c9dad5a543078c88ca887a9dd50a31b8336 (patch) | |
| tree | 3c3265078385f36a99bd4725edf7bcc7efd4b840 /src/com/android/settings/security/SimLockPreferenceController.java | |
| parent | 6b7b92ced519ffb2f2c0e34f6aa7ad53a9a8ce9f (diff) | |
| download | packages_apps_Settings-db816c9dad5a543078c88ca887a9dd50a31b8336.tar.gz packages_apps_Settings-db816c9dad5a543078c88ca887a9dd50a31b8336.tar.bz2 packages_apps_Settings-db816c9dad5a543078c88ca887a9dd50a31b8336.zip | |
[Mainline] Use public method in SubscriptionManager for mainline
- getActiveSubscriptionIdList
To use getActiveSubscriptionInfoList to get subscription Id list
- getActiveSubscriptionInfoList(Z)
To use getActiveSubscriptionInfoList() instead
Bug: 144478274
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkUtilsTest
make RunSettingsRoboTests ROBOTEST_FILTER=TelephonyBasePreferenceControllerTest
Change-Id: I4d6113561906af5c9e4ac7737aefac17c926059a
Diffstat (limited to 'src/com/android/settings/security/SimLockPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/security/SimLockPreferenceController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java index 3b23daa1e8..ffc1d6bbea 100644 --- a/src/com/android/settings/security/SimLockPreferenceController.java +++ b/src/com/android/settings/security/SimLockPreferenceController.java @@ -77,7 +77,7 @@ public class SimLockPreferenceController extends BasePreferenceController { */ private boolean isSimReady() { final List<SubscriptionInfo> subInfoList = - mSubscriptionManager.getActiveSubscriptionInfoList(true); + mSubscriptionManager.getActiveSubscriptionInfoList(); if (subInfoList != null) { for (SubscriptionInfo subInfo : subInfoList) { final int simState = mTelephonyManager.getSimState(subInfo.getSimSlotIndex()); @@ -95,7 +95,7 @@ public class SimLockPreferenceController extends BasePreferenceController { */ private boolean isSimIccReady() { final List<SubscriptionInfo> subInfoList = - mSubscriptionManager.getActiveSubscriptionInfoList(true); + mSubscriptionManager.getActiveSubscriptionInfoList(); if (subInfoList != null) { for (SubscriptionInfo subInfo : subInfoList) { |