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

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

@@ -988,17 +988,15 @@ public final class Utils {
* 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) {
public static SubscriptionInfo findRecordBySubId(final int subId) {
final List<SubscriptionInfo> subInfoList =
SubscriptionManager.from(context).getActiveSubscriptionInfoList();
if (subInfoList != null) {
final int subInfoLength = subInfoList.size();
SubscriptionManager.getActiveSubscriptionInfoList();
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;
}
for (int i = 0; i < subInfoLength; ++i) {
final SubscriptionInfo sir = subInfoList.get(i);
if (sir != null && sir.getSubscriptionId() == subId) {
return sir;
}
}
@@ -1009,18 +1007,16 @@ public final class Utils {
* 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) {
public static SubscriptionInfo findRecordBySlotId(final int slotId) {
final List<SubscriptionInfo> subInfoList =
SubscriptionManager.from(context).getActiveSubscriptionInfoList();
if (subInfoList != null) {
final int subInfoLength = subInfoList.size();
SubscriptionManager.getActiveSubscriptionInfoList();
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;
}
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;
}
}