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

Correct the way settings deals with subscriptions.

Browse Source 
Change-Id: I19e9dfaf248fce7376b124ee91de7e73fdc99fb3
This commit is contained in:
Stuart Scott
2015-04-08 09:40:48 -07:00
parent c2ab934117
commit f51d006350
8 changed files with 31 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,9 +132,9 @@ public class SimStatus extends InstrumentedPreferenceActivity {
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
mTelephonyManager = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
mSelectableSubInfos = SubscriptionManager.from(this).getActiveSubscriptionInfoList();
addPreferencesFromResource(R.xml.device_info_sim_status);
@@ -143,13 +143,6 @@ public class SimStatus extends InstrumentedPreferenceActivity {
// Note - missing in zaku build, be careful later...
mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
for (int i = 0; i < mTelephonyManager.getSimCount(); i++) {
final SubscriptionInfo sir = Utils.findRecordBySlotId(this, i);
if (sir != null) {
mSelectableSubInfos.add(sir);
}
}
mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
if (mSelectableSubInfos.size() > 1) {
setContentView(R.layout.sim_information);
@@ -351,10 +344,8 @@ public class SimStatus extends InstrumentedPreferenceActivity {
}
// If formattedNumber is null or empty, it'll display as "Unknown".
setSummaryText(KEY_PHONE_NUMBER, formattedNumber);
final String imei = mPhone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
? mPhone.getImei() : mPhone.getDeviceId();
setSummaryText(KEY_IMEI, imei);
setSummaryText(KEY_IMEI_SV, mTelephonyManager.getDeviceSoftwareVersion(/*slotId*/));
setSummaryText(KEY_IMEI, mPhone.getImei());
setSummaryText(KEY_IMEI_SV, mPhone.getDeviceSvn());
if (!mShowLatestAreaInfo) {
removePreferenceFromScreen(KEY_LATEST_AREA_INFO);