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

Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev

Browse Source
This commit is contained in:
Wink Saville
2014-11-12 01:13:26 +00:00
committed by Android (Google) Code Review
parent ceceb2ab07 ca7566125e
commit 588611eea5
5 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)){