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

Update SubscriptionManager API as per API council.

Browse Source 
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
This commit is contained in:
Wink Saville
2014-11-08 10:47:12 -08:00
parent 64cb79bb69
commit ca7566125e
5 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Profile;
import android.provider.ContactsContract.RawContacts;
import android.service.persistentdata.PersistentDataBlockManager;
import android.telephony.SubInfoRecord;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
@@ -988,12 +988,13 @@ public final class Utils {
* finds a record with subId.
* Since the number of SIMs are few, an array is fine.
*/
public static SubInfoRecord findRecordBySubId(final int subId) {
final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
public static SubscriptionInfo findRecordBySubId(final int subId) {
final List<SubscriptionInfo> subInfoList =
SubscriptionManager.getActiveSubscriptionInfoList();
final int subInfoLength = subInfoList.size();
for (int i = 0; i < subInfoLength; ++i) {
final SubInfoRecord sir = subInfoList.get(i);
final SubscriptionInfo sir = subInfoList.get(i);
if (sir != null && sir.getSubscriptionId() == subId) {
return sir;
}
@@ -1006,12 +1007,13 @@ public final class Utils {
* finds a record with slotId.
* Since the number of SIMs are few, an array is fine.
*/
public static SubInfoRecord findRecordBySlotId(final int slotId) {
final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
public static SubscriptionInfo findRecordBySlotId(final int slotId) {
final List<SubscriptionInfo> subInfoList =
SubscriptionManager.getActiveSubscriptionInfoList();
final int subInfoLength = subInfoList.size();
for (int i = 0; i < subInfoLength; ++i) {
final SubInfoRecord sir = subInfoList.get(i);
final SubscriptionInfo sir = subInfoList.get(i);
if (sir.getSimSlotIndex() == slotId) {
//Right now we take the first subscription on a SIM.
return sir;