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/sim | |
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/sim')
-rw-r--r-- | src/com/android/settings/sim/SimDialogActivity.java | 6 | ||||
-rw-r--r-- | src/com/android/settings/sim/SimSettings.java | 25 |
2 files changed, 11 insertions, 20 deletions
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java index 97762c4..03a9daf 100644 --- a/src/com/android/settings/sim/SimDialogActivity.java +++ b/src/com/android/settings/sim/SimDialogActivity.java @@ -80,7 +80,8 @@ public class SimDialogActivity extends Activity { private void displayPreferredDialog(final int slotId) { final Resources res = getResources(); final Context context = getApplicationContext(); - final SubscriptionInfo sir = Utils.findRecordBySlotId(context, slotId); + final SubscriptionInfo sir = SubscriptionManager.from(context) + .getActiveSubscriptionInfoForSimSlotIndex(slotId); if (sir != null) { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this); @@ -214,7 +215,8 @@ public class SimDialogActivity extends Activity { list.add((String)phoneAccount.getLabel()); int subId = telephonyManager.getSubIdForPhoneAccount(phoneAccount); if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { - final SubscriptionInfo sir = Utils.findRecordBySubId(context, subId); + final SubscriptionInfo sir = SubscriptionManager.from(context) + .getActiveSubscriptionInfo(subId); callsSubInfoList.add(sir); } else { callsSubInfoList.add(null); diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 91dadbb..184e882 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -151,7 +151,10 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots); mSelectableSubInfos = new ArrayList<SubscriptionInfo>(); for (int i = 0; i < numSlots; ++i) { - final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i); + // Less efficient than getActiveSubscriptionInfoList but we need to show a disable + // preference if the slot is empty + final SubscriptionInfo sir = mSubscriptionManager + .getActiveSubscriptionInfoForSimSlotIndex(i); SimPreference simPreference = new SimPreference(getActivity(), sir, i); simPreference.setOrder(i-numSlots); mSimCards.addPreference(simPreference); @@ -165,17 +168,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable } private void updateAvailableSubInfos(){ - final TelephonyManager tm = - (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE); - final int numSlots = tm.getSimCount(); - - mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots); - for (int i = 0; i < numSlots; ++i) { - final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i); - mAvailableSubInfos.add(sir); - if (sir != null) { - } - } + mAvailableSubInfos = mSubscriptionManager.getActiveSubscriptionInfoList(); } private void updateAllOptions() { @@ -203,8 +196,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable private void updateSmsValues() { final Preference simPref = findPreference(KEY_SMS); - final SubscriptionInfo sir = Utils.findRecordBySubId(getActivity(), - mSubscriptionManager.getDefaultSmsSubId()); + final SubscriptionInfo sir = mSubscriptionManager.getDefaultSmsSubscriptionInfo(); simPref.setTitle(R.string.sms_messages_title); if (DBG) log("[updateSmsValues] mSubInfoList=" + mSubInfoList); @@ -218,8 +210,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable private void updateCellularDataValues() { final Preference simPref = findPreference(KEY_CELLULAR_DATA); - final SubscriptionInfo sir = Utils.findRecordBySubId(getActivity(), - mSubscriptionManager.getDefaultDataSubId()); + final SubscriptionInfo sir = mSubscriptionManager.getDefaultDataSubscriptionInfo(); simPref.setTitle(R.string.cellular_data_title); if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList); @@ -396,14 +387,12 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable mSubInfoRecord.setDisplayName(displayName); mSubscriptionManager.setDisplayName(displayName, subId, SubscriptionManager.NAME_SOURCE_USER_INPUT); - Utils.findRecordBySubId(getActivity(), subId).setDisplayName(displayName); final int tintSelected = tintSpinner.getSelectedItemPosition(); int subscriptionId = mSubInfoRecord.getSubscriptionId(); int tint = mTintArr[tintSelected]; mSubInfoRecord.setIconTint(tint); mSubscriptionManager.setIconTint(tint, subscriptionId); - Utils.findRecordBySubId(getActivity(), subscriptionId).setIconTint(tint); updateAllOptions(); update(); |