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

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

@@ -1025,49 +1025,6 @@ public final class Utils {
return sb.toString();
}
/**
* finds a record with subId.
* Since the number of SIMs are few, an array is fine.
*/
public static SubscriptionInfo findRecordBySubId(Context context, final int subId) {
final List<SubscriptionInfo> subInfoList =
SubscriptionManager.from(context).getActiveSubscriptionInfoList();
if (subInfoList != null) {
final int subInfoLength = subInfoList.size();
for (int i = 0; i < subInfoLength; ++i) {
final SubscriptionInfo sir = subInfoList.get(i);
if (sir != null && sir.getSubscriptionId() == subId) {
return sir;
}
}
}
return null;
}
/**
* finds a record with slotId.
* Since the number of SIMs are few, an array is fine.
*/
public static SubscriptionInfo findRecordBySlotId(Context context, final int slotId) {
final List<SubscriptionInfo> subInfoList =
SubscriptionManager.from(context).getActiveSubscriptionInfoList();
if (subInfoList != null) {
final int subInfoLength = subInfoList.size();
for (int i = 0; i < subInfoLength; ++i) {
final SubscriptionInfo sir = subInfoList.get(i);
if (sir.getSimSlotIndex() == slotId) {
//Right now we take the first subscription on a SIM.
return sir;
}
}
}
return null;
}
/**
* Queries for the UserInfo of a user. Returns null if the user doesn't exist (was removed).
* @param userManager Instance of UserManager