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

Merge "Make SubscriptionManager.isActiveSubId public"

Browse Source
This commit is contained in:
Shuo Qian
2018-09-26 18:19:52 +00:00
committed by Gerrit Code Review
parent 8883851c71 ec149463cc
commit fafc51a088
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

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

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

@@ -1846,6 +1846,19 @@ public class SubscriptionManager {
return new Resources(context.getResources().getAssets(), newMetrics, newConfig); 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 * @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. * and the SIM providing the subscription is present in a slot and in "LOADED" state.
@@ -1856,7 +1869,7 @@ public class SubscriptionManager {
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) { if (iSub != null) {
return iSub.isActiveSubId(subId); return iSub.isActiveSubId(subId, mContext.getOpPackageName());
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
} }

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

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