diff options
| author | Wink Saville <wink@google.com> | 2014-11-12 01:13:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-12 01:13:27 +0000 |
| commit | 588611eea55ee3ef617d17ea89c16174935a6a1a (patch) | |
| tree | ec88989ebf8c6d0355fa5bd90f651704eb1ca5a7 /src/com/android/settings/SecuritySettings.java | |
| parent | ceceb2ab07aab457a4229d051de222ad88ed62a1 (diff) | |
| parent | ca7566125e00ed267aba831bd1d6d1ad78d90c17 (diff) | |
| download | packages_apps_Settings-588611eea55ee3ef617d17ea89c16174935a6a1a.zip packages_apps_Settings-588611eea55ee3ef617d17ea89c16174935a6a1a.tar.gz packages_apps_Settings-588611eea55ee3ef617d17ea89c16174935a6a1a.tar.bz2 | |
Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index ab08553..ab39689 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -44,7 +44,7 @@ import android.security.KeyStore; import android.service.trust.TrustAgentService; import android.telephony.TelephonyManager; import android.telephony.SubscriptionManager; -import android.telephony.SubInfoRecord; +import android.telephony.SubscriptionInfo; import android.text.TextUtils; import android.util.Log; @@ -372,9 +372,9 @@ public class SecuritySettings extends SettingsPreferenceFragment */ private static boolean isSimReady() { int simState = TelephonyManager.SIM_STATE_UNKNOWN; - final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList(); + final List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList(); if (subInfoList != null) { - for (SubInfoRecord subInfo : subInfoList) { + for (SubscriptionInfo subInfo : subInfoList) { simState = TelephonyManager.getDefault().getSimState(subInfo.getSimSlotIndex()); if((simState != TelephonyManager.SIM_STATE_ABSENT) && (simState != TelephonyManager.SIM_STATE_UNKNOWN)){ |