diff options
| author | Wink Saville <wink@google.com> | 2014-11-20 20:27:34 +0000 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2014-11-20 20:27:34 +0000 |
| commit | 9aa0dd69c53fabfbd4e894e5eca6c9b6d879fdd3 (patch) | |
| tree | a97b5a13a8e108189f806fc02f77dd3807be0cda /src/com/android/settings/SecuritySettings.java | |
| parent | 1285f74fcb6a8bf080c224e5a36db00ab1167d4c (diff) | |
| download | packages_apps_Settings-9aa0dd69c53fabfbd4e894e5eca6c9b6d879fdd3.zip packages_apps_Settings-9aa0dd69c53fabfbd4e894e5eca6c9b6d879fdd3.tar.gz packages_apps_Settings-9aa0dd69c53fabfbd4e894e5eca6c9b6d879fdd3.tar.bz2 | |
Revert "Additional changes to SubscriptionManager API as per API council."
This reverts commit 1285f74fcb6a8bf080c224e5a36db00ab1167d4c.
Change-Id: I366556368a9c429d8c356bcdb8e29af9c6c4c71e
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 9b7b0cf..ab39689 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -111,7 +111,6 @@ public class SecuritySettings extends SettingsPreferenceFragment private static final boolean ONLY_ONE_TRUST_AGENT = true; private DevicePolicyManager mDPM; - private SubscriptionManager mSubscriptionManager; private ChooseLockSettingsHelper mChooseLockSettingsHelper; private LockPatternUtils mLockPatternUtils; @@ -371,10 +370,9 @@ public class SecuritySettings extends SettingsPreferenceFragment /* Return true if a SIM is ready for locking. * TODO: consider adding to TelephonyManager or SubscritpionManasger. */ - private boolean isSimReady() { + private static boolean isSimReady() { int simState = TelephonyManager.SIM_STATE_UNKNOWN; - final List<SubscriptionInfo> subInfoList = - mSubscriptionManager.getActiveSubscriptionInfoList(); + final List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList(); if (subInfoList != null) { for (SubscriptionInfo subInfo : subInfoList) { simState = TelephonyManager.getDefault().getSimState(subInfo.getSimSlotIndex()); |