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

Revert "Additional changes to SubscriptionManager API as per API council."

Browse Source 
This reverts commit 1285f74fcb.

Change-Id: I366556368a9c429d8c356bcdb8e29af9c6c4c71e
This commit is contained in:
Wink Saville
2014-11-20 20:27:34 +00:00
parent 1285f74fcb
commit 9aa0dd69c5
8 changed files with 80 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/DataUsageSummary.java
View File

@@ -195,7 +195,6 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
private INetworkStatsService mStatsService; private INetworkStatsService mStatsService;
private NetworkPolicyManager mPolicyManager; private NetworkPolicyManager mPolicyManager;
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
private SubscriptionManager mSubscriptionManager;
private INetworkStatsSession mStatsSession; private INetworkStatsSession mStatsSession;
@@ -287,14 +286,13 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
ServiceManager.getService(Context.NETWORK_STATS_SERVICE)); ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
mPolicyManager = NetworkPolicyManager.from(context); mPolicyManager = NetworkPolicyManager.from(context);
mTelephonyManager = TelephonyManager.from(context); mTelephonyManager = TelephonyManager.from(context);
mSubscriptionManager = SubscriptionManager.from(context);
mPrefs = getActivity().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE); mPrefs = getActivity().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);
mPolicyEditor = new NetworkPolicyEditor(mPolicyManager); mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
mPolicyEditor.read(); mPolicyEditor.read();
mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList(); mSubInfoList = SimSettings.getSortedSubInfoList(getActivity());
mMobileTagMap = initMobileTabTag(mSubInfoList); mMobileTagMap = initMobileTabTag(mSubInfoList);
try { try {
@@ -944,7 +942,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
} else { } else {
//SUB SELECT //SUB SELECT
isEnable = mTelephonyManager.getDataEnabled() isEnable = mTelephonyManager.getDataEnabled()
&& (subId == mSubscriptionManager.getDefaultDataSubId()); && (subId == SubscriptionManager.getDefaultDataSubId());
} }
return isEnable; return isEnable;
} }
@@ -1133,8 +1131,8 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
private void handleMultiSimDataDialog() { private void handleMultiSimDataDialog() {
final SubscriptionInfo currentSir = getCurrentTabSubInfo(getActivity()); final SubscriptionInfo currentSir = getCurrentTabSubInfo(getActivity());
final SubscriptionInfo nextSir = mSubscriptionManager.getActiveSubscriptionInfo( final SubscriptionInfo nextSir = SubscriptionManager.getSubscriptionInfoForSubscriber(
mSubscriptionManager.getDefaultDataSubId()); SubscriptionManager.getDefaultDataSubId());
if (currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) { if (currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {
setMobileDataEnabled(true); setMobileDataEnabled(true);
@@ -1151,7 +1149,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
mSubscriptionManager.setDefaultDataSubId(currentSir.getSubscriptionId()); SubscriptionManager.setDefaultDataSubId(currentSir.getSubscriptionId());
setMobileDataEnabled(true); setMobileDataEnabled(true);
updateBody(); updateBody();
} }
@@ -2248,7 +2246,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
final NetworkTemplate template = intent.getParcelableExtra(EXTRA_NETWORK_TEMPLATE); final NetworkTemplate template = intent.getParcelableExtra(EXTRA_NETWORK_TEMPLATE);
if (template == null) { if (template == null) {
final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY, final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
SubscriptionManager.INVALID_SUBSCRIPTION_ID); SubscriptionManager.INVALID_SUB_ID);
if (SubscriptionManager.isValidSubId(subId)) { if (SubscriptionManager.isValidSubId(subId)) {
return TAB_MOBILE + String.valueOf(subId); return TAB_MOBILE + String.valueOf(subId);
} }
@@ -2341,8 +2339,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
final ConnectivityManager conn = ConnectivityManager.from(context); final ConnectivityManager conn = ConnectivityManager.from(context);
final TelephonyManager tele = TelephonyManager.from(context); final TelephonyManager tele = TelephonyManager.from(context);
final List<SubscriptionInfo> subInfoList = final List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
SubscriptionManager.from(context).getActiveSubscriptionInfoList();
// No activated Subscription // No activated Subscription
if (subInfoList == null) { if (subInfoList == null) {
return false; return false;

4
src/com/android/settings/IccLockSettings.java
View File

@@ -215,7 +215,7 @@ public class IccLockSettings extends PreferenceActivity
mTabHost.clearAllTabs(); mTabHost.clearAllTabs();
for (int i = 0; i < numSims; ++i) { for (int i = 0; i < numSims; ++i) {
final SubscriptionInfo subInfo = Utils.findRecordBySlotId(this, i); final SubscriptionInfo subInfo = Utils.findRecordBySlotId(i);
mTabHost.addTab(buildTabSpec(String.valueOf(i), mTabHost.addTab(buildTabSpec(String.valueOf(i),
String.valueOf(subInfo == null String.valueOf(subInfo == null
? context.getString(R.string.sim_editor_title, i + 1) ? context.getString(R.string.sim_editor_title, i + 1)
@@ -469,7 +469,7 @@ public class IccLockSettings extends PreferenceActivity
@Override @Override
public void onTabChanged(String tabId) { public void onTabChanged(String tabId) {
final int slotId = Integer.parseInt(tabId); final int slotId = Integer.parseInt(tabId);
final SubscriptionInfo sir = Utils.findRecordBySlotId(getBaseContext(), slotId); final SubscriptionInfo sir = Utils.findRecordBySlotId(slotId);
mPhone = (sir == null) ? null mPhone = (sir == null) ? null
: PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId())); : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));

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

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

12
src/com/android/settings/Utils.java
View File

@@ -988,10 +988,9 @@ public final class Utils {
* finds a record with subId. * finds a record with subId.
* Since the number of SIMs are few, an array is fine. * Since the number of SIMs are few, an array is fine.
*/ */
public static SubscriptionInfo findRecordBySubId(Context context, final int subId) { public static SubscriptionInfo findRecordBySubId(final int subId) {
final List<SubscriptionInfo> subInfoList = final List<SubscriptionInfo> subInfoList =
SubscriptionManager.from(context).getActiveSubscriptionInfoList(); SubscriptionManager.getActiveSubscriptionInfoList();
if (subInfoList != null) {
final int subInfoLength = subInfoList.size(); final int subInfoLength = subInfoList.size();
for (int i = 0; i < subInfoLength; ++i) { for (int i = 0; i < subInfoLength; ++i) {
@@ -1000,7 +999,6 @@ public final class Utils {
return sir; return sir;
} }
} }
}
return null; return null;
} }
@@ -1009,10 +1007,9 @@ public final class Utils {
* finds a record with slotId. * finds a record with slotId.
* Since the number of SIMs are few, an array is fine. * Since the number of SIMs are few, an array is fine.
*/ */
public static SubscriptionInfo findRecordBySlotId(Context context, final int slotId) { public static SubscriptionInfo findRecordBySlotId(final int slotId) {
final List<SubscriptionInfo> subInfoList = final List<SubscriptionInfo> subInfoList =
SubscriptionManager.from(context).getActiveSubscriptionInfoList(); SubscriptionManager.getActiveSubscriptionInfoList();
if (subInfoList != null) {
final int subInfoLength = subInfoList.size(); final int subInfoLength = subInfoList.size();
for (int i = 0; i < subInfoLength; ++i) { for (int i = 0; i < subInfoLength; ++i) {
@@ -1022,7 +1019,6 @@ public final class Utils {
return sir; return sir;
} }
} }
}
return null; return null;
} }

13
src/com/android/settings/deviceinfo/ImeiInformation.java
View File

@@ -42,12 +42,9 @@ public class ImeiInformation extends PreferenceActivity {
private static final String KEY_IMEI = "imei"; private static final String KEY_IMEI = "imei";
private static final String KEY_IMEI_SV = "imei_sv"; private static final String KEY_IMEI_SV = "imei_sv";
private SubscriptionManager mSubscriptionManager;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mSubscriptionManager = SubscriptionManager.from(this);
final TelephonyManager telephonyManager = final TelephonyManager telephonyManager =
(TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE); (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
initPreferenceScreen(telephonyManager.getSimCount()); initPreferenceScreen(telephonyManager.getSimCount());
@@ -103,17 +100,17 @@ public class ImeiInformation extends PreferenceActivity {
} }
} }
private Phone getPhoneFromSlotId(int slotIdx) { private Phone getPhoneFromSlotId(int slotId) {
final SubscriptionInfo subInfo = final List<SubscriptionInfo> subInfos = SubscriptionManager.getSubscriptionInfoUsingSlotId(slotId);
mSubscriptionManager.getActiveSubscriptionInfoForSimSlotIndex(slotIdx);
if (subInfo == null) { if (subInfos == null || subInfos.size() < 1) {
return null; return null;
} }
final Phone[] phones = PhoneFactory.getPhones(); final Phone[] phones = PhoneFactory.getPhones();
for (int i = 0; i < phones.length; i++) { for (int i = 0; i < phones.length; i++) {
if (phones[i].getSubId() == subInfo.getSubscriptionId()) { // Currently we only operate with the first subscription of a SIM.
if (phones[i].getSubId() == subInfos.get(0).getSubscriptionId()) {
return phones[i]; return phones[i];
} }
} }

6
src/com/android/settings/deviceinfo/SimStatus.java
View File

@@ -11,7 +11,7 @@
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.android.settings.deviceinfo; package com.android.settings.deviceinfo;
@@ -143,7 +143,7 @@ public class SimStatus extends PreferenceActivity {
mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH); mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
for (int i = 0; i < mTelephonyManager.getSimCount(); i++) { for (int i = 0; i < mTelephonyManager.getSimCount(); i++) {
final SubscriptionInfo sir = Utils.findRecordBySlotId(this, i); final SubscriptionInfo sir = Utils.findRecordBySlotId(i);
if (sir != null) { if (sir != null) {
mSelectableSubInfos.add(sir); mSelectableSubInfos.add(sir);
} }
@@ -355,7 +355,7 @@ public class SimStatus extends PreferenceActivity {
final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId( final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
mSir.getSubscriptionId())); mSir.getSubscriptionId()));
if (UserHandle.myUserId() == UserHandle.USER_OWNER if (UserHandle.myUserId() == UserHandle.USER_OWNER
&& mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUB_ID) {
if (phone == null) { if (phone == null) {
Log.e(TAG, "Unable to locate a phone object for the given Subscription ID."); Log.e(TAG, "Unable to locate a phone object for the given Subscription ID.");
return; return;

19
src/com/android/settings/sim/SimBootReceiver.java
View File

@@ -19,6 +19,8 @@ package com.android.settings.sim;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Settings.SimSettingsActivity; import com.android.settings.Settings.SimSettingsActivity;
import java.util.List;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
@@ -29,9 +31,10 @@ import android.content.SharedPreferences.Editor;
import android.content.res.Resources; import android.content.res.Resources;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionListener;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener; import android.util.Log;
import com.android.settings.Utils; import com.android.settings.Utils;
@@ -44,17 +47,16 @@ public class SimBootReceiver extends BroadcastReceiver {
private SharedPreferences mSharedPreferences = null; private SharedPreferences mSharedPreferences = null;
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
private Context mContext; private Context mContext;
private SubscriptionManager mSubscriptionManager;
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
mContext = context; mContext = context;
mSubscriptionManager = SubscriptionManager.from(mContext);
mSharedPreferences = mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, mSharedPreferences = mContext.getSharedPreferences(SHARED_PREFERENCES_NAME,
Context.MODE_PRIVATE); Context.MODE_PRIVATE);
mSubscriptionManager.registerOnSubscriptionsChangedListener(mSubscriptionListener); SubscriptionManager.register(mContext, mSubscriptionListener,
SubscriptionListener.LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED);
} }
private void detectChangeAndNotify() { private void detectChangeAndNotify() {
@@ -69,12 +71,12 @@ public class SimBootReceiver extends BroadcastReceiver {
// by checking if the list is empty. // by checking if the list is empty.
// This is not completely correct, but works for most cases. // This is not completely correct, but works for most cases.
// See Bug: 18377252 // See Bug: 18377252
if (mSubscriptionManager.getActiveSubscriptionInfoList().size() < 1) { if (SubscriptionManager.getActiveSubscriptionInfoList().size() < 1) {
return; return;
} }
for (int i = 0; i < numSlots; i++) { for (int i = 0; i < numSlots; i++) {
final SubscriptionInfo sir = Utils.findRecordBySlotId(mContext, i); final SubscriptionInfo sir = Utils.findRecordBySlotId(i);
final String key = SLOT_PREFIX+i; final String key = SLOT_PREFIX+i;
final int lastSubId = getLastSubId(key); final int lastSubId = getLastSubId(key);
@@ -131,10 +133,9 @@ public class SimBootReceiver extends BroadcastReceiver {
notificationManager.cancel(NOTIFICATION_ID); notificationManager.cancel(NOTIFICATION_ID);
} }
private final OnSubscriptionsChangedListener mSubscriptionListener = private final SubscriptionListener mSubscriptionListener = new SubscriptionListener() {
new OnSubscriptionsChangedListener() {
@Override @Override
public void onSubscriptionsChanged() { public void onSubscriptionInfoChanged() {
detectChangeAndNotify(); detectChangeAndNotify();
} }
}; };

68
src/com/android/settings/sim/SimSettings.java
View File

@@ -69,7 +69,6 @@ import java.util.List;
public class SimSettings extends RestrictedSettingsFragment implements Indexable { public class SimSettings extends RestrictedSettingsFragment implements Indexable {
private static final String TAG = "SimSettings"; private static final String TAG = "SimSettings";
private static final boolean DBG = false;
private static final String DISALLOW_CONFIG_SIM = "no_config_sim"; private static final String DISALLOW_CONFIG_SIM = "no_config_sim";
private static final String SIM_CARD_CATEGORY = "sim_cards"; private static final String SIM_CARD_CATEGORY = "sim_cards";
@@ -119,9 +118,6 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
private PreferenceCategory mSimCards = null; private PreferenceCategory mSimCards = null;
private SubscriptionManager mSubscriptionManager;
private Utils mUtils;
public SimSettings() { public SimSettings() {
super(DISALLOW_CONFIG_SIM); super(DISALLOW_CONFIG_SIM);
} }
@@ -130,13 +126,9 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
public void onCreate(final Bundle bundle) { public void onCreate(final Bundle bundle) {
super.onCreate(bundle); super.onCreate(bundle);
mSubscriptionManager = SubscriptionManager.from(getActivity());
if (mSubInfoList == null) { if (mSubInfoList == null) {
mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList(); mSubInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
// FIXME: b/18385348, SimSettings.java needs to handle null from getActiveSubscription
} }
if (DBG) log("[onCreate] mSubInfoList=" + mSubInfoList);
createPreferences(); createPreferences();
updateAllOptions(); updateAllOptions();
@@ -156,7 +148,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots); mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
mSelectableSubInfos = new ArrayList<SubscriptionInfo>(); mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
for (int i = 0; i < numSlots; ++i) { for (int i = 0; i < numSlots; ++i) {
final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i); final SubscriptionInfo sir = Utils.findRecordBySlotId(i);
mSimCards.addPreference(new SimPreference(getActivity(), sir, i)); mSimCards.addPreference(new SimPreference(getActivity(), sir, i));
mAvailableSubInfos.add(sir); mAvailableSubInfos.add(sir);
if (sir != null) { if (sir != null) {
@@ -174,7 +166,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots); mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
for (int i = 0; i < numSlots; ++i) { for (int i = 0; i < numSlots; ++i) {
final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i); final SubscriptionInfo sir = Utils.findRecordBySlotId(i);
mAvailableSubInfos.add(sir); mAvailableSubInfos.add(sir);
if (sir != null) { if (sir != null) {
} }
@@ -187,7 +179,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
} }
private void updateSimSlotValues() { private void updateSimSlotValues() {
mSubscriptionManager.getAllSubscriptionInfoList(); SubscriptionManager.getAllSubscriptionInfoList();
final int prefSize = mSimCards.getPreferenceCount(); final int prefSize = mSimCards.getPreferenceCount();
for (int i = 0; i < prefSize; ++i) { for (int i = 0; i < prefSize; ++i) {
@@ -206,11 +198,9 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
private void updateSmsValues() { private void updateSmsValues() {
final Preference simPref = findPreference(KEY_SMS); final Preference simPref = findPreference(KEY_SMS);
final SubscriptionInfo sir = Utils.findRecordBySubId(getActivity(), final SubscriptionInfo sir = Utils.findRecordBySubId(SubscriptionManager.getDefaultSmsSubId());
mSubscriptionManager.getDefaultSmsSubId());
simPref.setTitle(R.string.sms_messages_title); simPref.setTitle(R.string.sms_messages_title);
if (DBG) log("[updateSmsValues] mSubInfoList=" + mSubInfoList); if (mSubInfoList.size() == 1) {
if (mSubInfoList != null && mSubInfoList.size() == 1) {
simPref.setSummary(mSubInfoList.get(0).getDisplayName()); simPref.setSummary(mSubInfoList.get(0).getDisplayName());
} else if (sir != null) { } else if (sir != null) {
simPref.setSummary(sir.getDisplayName()); simPref.setSummary(sir.getDisplayName());
@@ -222,12 +212,9 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
private void updateCellularDataValues() { private void updateCellularDataValues() {
final Preference simPref = findPreference(KEY_CELLULAR_DATA); final Preference simPref = findPreference(KEY_CELLULAR_DATA);
final SubscriptionInfo sir = Utils.findRecordBySubId(getActivity(), final SubscriptionInfo sir = Utils.findRecordBySubId(SubscriptionManager.getDefaultDataSubId());
mSubscriptionManager.getDefaultDataSubId());
simPref.setTitle(R.string.cellular_data_title); simPref.setTitle(R.string.cellular_data_title);
if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList); if (mSubInfoList.size() == 1) {
if (mSubInfoList != null && mSubInfoList.size() == 1) {
simPref.setSummary(mSubInfoList.get(0).getDisplayName()); simPref.setSummary(mSubInfoList.get(0).getDisplayName());
} else if (sir != null) { } else if (sir != null) {
simPref.setSummary(sir.getDisplayName()); simPref.setSummary(sir.getDisplayName());
@@ -253,9 +240,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
mSubInfoList = mSubscriptionManager.getActiveSubscriptionInfoList(); mSubInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
if (DBG) log("[onResme] mSubInfoList=" + mSubInfoList);
updateAvailableSubInfos(); updateAvailableSubInfos();
updateAllOptions(); updateAllOptions();
} }
@@ -290,7 +275,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
if (id == DATA_PICK) { if (id == DATA_PICK) {
sir = mSelectableSubInfos.get(value); sir = mSelectableSubInfos.get(value);
mSubscriptionManager.setDefaultDataSubId(sir.getSubscriptionId()); SubscriptionManager.setDefaultDataSubId(sir.getSubscriptionId());
} else if (id == CALLS_PICK) { } else if (id == CALLS_PICK) {
final TelecomManager telecomManager = final TelecomManager telecomManager =
TelecomManager.from(getActivity()); TelecomManager.from(getActivity());
@@ -300,7 +285,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
value < 1 ? null : phoneAccountsList.get(value - 1)); value < 1 ? null : phoneAccountsList.get(value - 1));
} else if (id == SMS_PICK) { } else if (id == SMS_PICK) {
sir = mSelectableSubInfos.get(value); sir = mSelectableSubInfos.get(value);
mSubscriptionManager.setDefaultSmsSubId(sir.getSubscriptionId()); SubscriptionManager.setDefaultSmsSubId(sir.getSubscriptionId());
} }
updateActivitesCategory(); updateActivitesCategory();
@@ -514,16 +499,16 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
String displayName = nameText.getText().toString(); String displayName = nameText.getText().toString();
int subId = mSubInfoRecord.getSubscriptionId(); int subId = mSubInfoRecord.getSubscriptionId();
mSubInfoRecord.setDisplayName(displayName); mSubInfoRecord.setDisplayName(displayName);
mSubscriptionManager.setDisplayName(displayName, subId, SubscriptionManager.setDisplayName(displayName, subId,
SubscriptionManager.NAME_SOURCE_USER_INPUT); SubscriptionManager.NAME_SOURCE_USER_INPUT);
Utils.findRecordBySubId(getActivity(), subId).setDisplayName(displayName); Utils.findRecordBySubId(subId).setDisplayName(displayName);
final int tintSelected = tintSpinner.getSelectedItemPosition(); final int tintSelected = tintSpinner.getSelectedItemPosition();
int subscriptionId = mSubInfoRecord.getSubscriptionId(); int subscriptionId = mSubInfoRecord.getSubscriptionId();
int tint = mTintArr[tintSelected]; int tint = mTintArr[tintSelected];
mSubInfoRecord.setIconTint(tint); mSubInfoRecord.setIconTint(tint);
mSubscriptionManager.setIconTint(tint, subscriptionId); SubscriptionManager.setIconTint(tint, subscriptionId);
Utils.findRecordBySubId(getActivity(), subscriptionId).setIconTint(tint); Utils.findRecordBySubId(subscriptionId).setIconTint(tint);
updateAllOptions(); updateAllOptions();
update(); update();
@@ -611,8 +596,27 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
} }
private void log(String s) { /**
Log.d(TAG, s); * Sort Subscription List in SIM Id, Subscription Id
* @param context The Context
* @return Sorted Subscription List or NULL if no activated Subscription
*/
public static List<SubscriptionInfo> getSortedSubInfoList(Context context) {
List<SubscriptionInfo> infoList = SubscriptionManager.getActiveSubscriptionInfoList();
if (infoList != null) {
Collections.sort(infoList, new Comparator<SubscriptionInfo>() {
@Override
public int compare(SubscriptionInfo arg0, SubscriptionInfo arg1) {
int flag = arg0.getSimSlotIndex() - arg1.getSimSlotIndex();
if (flag == 0) {
return arg0.getSubscriptionId() - arg1.getSubscriptionId();
}
return flag;
}
});
}
return infoList;
} }
/** /**