Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make SubscriptionManager.isActiveSubId public

Browse Source 
Rename subId to subscriptionId

Bug: 113072551
Test: Treehugger
Change-Id: I6f7e0d06a2ad2367dad04723fea808cad8f9597a
This commit is contained in:
sqian
2018-09-10 19:05:51 -07:00
parent 26e686a973
commit ec149463cc
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -42456,6 +42456,7 @@ package android.telephony {
method public static int getDefaultVoiceSubscriptionId();
method public static int[] getSubscriptionIds(int);
method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);
method public boolean isActiveSubscriptionId(int);
method public boolean isNetworkRoaming(int);
method public void removeOnOpportunisticSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);
method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);

15
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -1825,6 +1825,19 @@ public class SubscriptionManager {
return new Resources(context.getResources().getAssets(), newMetrics, newConfig);
}
/**
* Checks if the supplied subscription ID corresponds to an active subscription.
*
* @param subscriptionId the subscription ID.
* @return {@code true} if the supplied subscription ID corresponds to an active subscription;
* {@code false} if it does not correspond to an active subscription; or throw a
* SecurityException if the caller hasn't got the right permission.
*/
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public boolean isActiveSubscriptionId(int subscriptionId) {
return isActiveSubId(subscriptionId);
}
/**
* @return true if the sub ID is active. i.e. The sub ID corresponds to a known subscription
* and the SIM providing the subscription is present in a slot and in "LOADED" state.
@@ -1835,7 +1848,7 @@ public class SubscriptionManager {
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
return iSub.isActiveSubId(subId);
return iSub.isActiveSubId(subId, mContext.getOpPackageName());
}
} catch (RemoteException ex) {
}

2
telephony/java/com/android/internal/telephony/ISub.aidl
View File

@@ -232,5 +232,5 @@ interface ISub {
*/
int getSimStateForSlotIndex(int slotIndex);
boolean isActiveSubId(int subId);
boolean isActiveSubId(int subId, String callingPackage);
}