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

Additional changes to SubscriptionManager API as per API council.

Browse Source 
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
This commit is contained in:
Wink Saville
2014-11-19 10:34:28 -08:00
parent 3a84d40133
commit 1285f74fcb
8 changed files with 87 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/SecuritySettings.java
View File

@@ -111,6 +111,7 @@ 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;
@@ -370,9 +371,10 @@ public class SecuritySettings extends SettingsPreferenceFragment
/* Return true if a SIM is ready for locking.
* TODO: consider adding to TelephonyManager or SubscritpionManasger.
*/
private static boolean isSimReady() {
private boolean isSimReady() {
int simState = TelephonyManager.SIM_STATE_UNKNOWN;
final List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
final List<SubscriptionInfo> subInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList();
if (subInfoList != null) {
for (SubscriptionInfo subInfo : subInfoList) {
simState = TelephonyManager.getDefault().getSimState(subInfo.getSimSlotIndex());