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

Merge "Make SubscriptionManager.isValidSubscriptionId public" am: 241aa86ed6

Browse Source 
am: 7dc073995b

Change-Id: Ida9690580f2c1c5ab35cb34e194907de6505085b
This commit is contained in:
sqian
2018-09-11 18:54:01 -07:00
committed by android-build-merger
parent 43908f112b 7dc073995b
commit bd4b87961f
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 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);

12
telephony/java/android/telephony/SubscriptionManager.java
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;
}
/**