Merge "Make SubscriptionManager.isValidSubscriptionId public"

This commit is contained in:
Treehugger Robot
2018-09-11 23:47:31 +00:00
committed by Gerrit Code Review
2 changed files with 8 additions and 5 deletions

View File

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

View File

@@ -1589,12 +1589,14 @@ public class SubscriptionManager {
}
/**
* @return true if a valid subId else false
* @hide
* Checks if the supplied subscription ID is valid.
* Note: a valid subscription ID does not necessarily correspond to an active subscription.
*
* @param subscriptionId The subscription ID.
* @return true if the supplied subscriptionId is valid; false otherwise.
*/
@UnsupportedAppUsage
public static boolean isValidSubscriptionId(int subId) {
return subId > INVALID_SUBSCRIPTION_ID ;
public static boolean isValidSubscriptionId(int subscriptionId) {
return subscriptionId > INVALID_SUBSCRIPTION_ID;
}
/**