From d85710432560e41535d3b32b7622fff48199db99 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Tue, 2 Sep 2014 22:40:55 -0700 Subject: [PATCH] Prepare to make SubscriptionManager public. Sync SubscriptionManager and its dependentes between lmp-dev and lmp-sprout-dev. Change-Id: Ie06ced3e7ff5a3d06b3b47892fed22b4bb8972c7 --- src/com/android/settings/sim/SimSettings.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 6526996fe4d..abfeccb6c84 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -99,7 +99,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable super.onCreate(bundle); if (mSubInfoList == null) { - mSubInfoList = SubscriptionManager.getActivatedSubInfoList(getActivity()); + mSubInfoList = SubscriptionManager.getActiveSubInfoList(); } createPreferences(); @@ -135,7 +135,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable } private void updateSimSlotValues() { - SubscriptionManager.getAllSubInfoList(getActivity()); + SubscriptionManager.getAllSubInfoList(); final PreferenceCategory simCards = (PreferenceCategory)findPreference(SIM_CARD_CATEGORY); final PreferenceScreen prefScreen = getPreferenceScreen(); @@ -197,7 +197,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable private void updateSmsValues() { final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_SMS); - final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getPreferredSmsSubId()); + final SubInfoRecord sir = findRecordBySubId(SubscriptionManager.getDefaultSmsSubId()); if (sir != null) { simPref.setSelectedItem(sir.mSlotId + 1); } @@ -344,13 +344,13 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable final Spinner displayNumbers = (Spinner)dialogLayout.findViewById(R.id.display_numbers); - SubscriptionManager.setDisplayNumberFormat(getActivity(), + SubscriptionManager.setDisplayNumberFormat( displayNumbers.getSelectedItemPosition() == 0 ? SubscriptionManager.DISPLAY_NUMBER_LAST : SubscriptionManager.DISPLAY_NUMBER_FIRST, mSubInfoRecord.mSubId); mSubInfoRecord.mDisplayName = nameText.getText().toString(); - SubscriptionManager.setDisplayName(getActivity(), mSubInfoRecord.mDisplayName, + SubscriptionManager.setDisplayName(mSubInfoRecord.mDisplayName, mSubInfoRecord.mSubId); updateAllOptions();