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

6
src/com/android/settings/sim/SimDialogActivity.java
View File

@@ -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);