diff options
author | Stuart Scott <stuartscott@google.com> | 2015-04-08 09:40:48 -0700 |
---|---|---|
committer | Stuart Scott <stuartscott@google.com> | 2015-04-08 11:11:34 -0700 |
commit | f51d00635028c0b87dd431c33c932ad20202d032 (patch) | |
tree | 42e9928538f6aed4b90128fbba5a55f454ff9d9f /src/com/android/settings/IccLockSettings.java | |
parent | c2ab9341179c876b782c45d3d69897f9fd5fab80 (diff) | |
download | packages_apps_Settings-f51d00635028c0b87dd431c33c932ad20202d032.zip packages_apps_Settings-f51d00635028c0b87dd431c33c932ad20202d032.tar.gz packages_apps_Settings-f51d00635028c0b87dd431c33c932ad20202d032.tar.bz2 |
Correct the way settings deals with subscriptions.
Change-Id: I19e9dfaf248fce7376b124ee91de7e73fdc99fb3
Diffstat (limited to 'src/com/android/settings/IccLockSettings.java')
-rw-r--r-- | src/com/android/settings/IccLockSettings.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 0e47afb..168d3c8 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -212,14 +212,15 @@ public class IccLockSettings extends InstrumentedPreferenceActivity mTabHost.setOnTabChangedListener(mTabListener); mTabHost.clearAllTabs(); + SubscriptionManager sm = SubscriptionManager.from(this); for (int i = 0; i < numSims; ++i) { - final SubscriptionInfo subInfo = Utils.findRecordBySlotId(this, i); + final SubscriptionInfo subInfo = sm.getActiveSubscriptionInfoForSimSlotIndex(i); mTabHost.addTab(buildTabSpec(String.valueOf(i), String.valueOf(subInfo == null ? context.getString(R.string.sim_editor_title, i + 1) : subInfo.getDisplayName()))); } - final SubscriptionInfo sir = Utils.findRecordBySlotId(getBaseContext(), 0); + final SubscriptionInfo sir = sm.getActiveSubscriptionInfoForSimSlotIndex(0); mPhone = (sir == null) ? null : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId())); @@ -476,7 +477,8 @@ public class IccLockSettings extends InstrumentedPreferenceActivity @Override public void onTabChanged(String tabId) { final int slotId = Integer.parseInt(tabId); - final SubscriptionInfo sir = Utils.findRecordBySlotId(getBaseContext(), slotId); + final SubscriptionInfo sir = SubscriptionManager.from(getBaseContext()) + .getActiveSubscriptionInfoForSimSlotIndex(slotId); mPhone = (sir == null) ? null : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId())); |