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

Merge "Make SubscriptionManager.isValidSubscriptionId public"

Browse Source 
am: 241aa86ed6

Change-Id: Ibbb69ba6e01d21bdd414afc73a90a965244eeae6
This commit is contained in:
sqian
2018-09-11 18:31:32 -07:00
committed by android-build-merger
parent 8964390dd3 241aa86ed6
commit 7dc073995b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -42457,6 +42457,7 @@ package android.telephony {
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 isNetworkRoaming(int); method public boolean isNetworkRoaming(int);
method public static boolean isValidSubscriptionId(int);
method public void removeOnOpportunisticSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener); method public void removeOnOpportunisticSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);
method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
method public void setSubscriptionOverrideCongested(int, boolean, long); method public void setSubscriptionOverrideCongested(int, boolean, long);

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

@@ -1589,12 +1589,14 @@ public class SubscriptionManager {
} }
/** /**
* @return true if a valid subId else false * Checks if the supplied subscription ID is valid.
* @hide * 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 subscriptionId) {
public static boolean isValidSubscriptionId(int subId) { return subscriptionId > INVALID_SUBSCRIPTION_ID;
return subId > INVALID_SUBSCRIPTION_ID ;
} }
/** /**