Merge "Make SubscriptionManager.getSubId public"

am: f9fa9a63bb

Change-Id: I1dbc088c8668df43a18741a58b9c32ef5eae1fc9
This commit is contained in:
sqian
2018-09-06 13:26:59 -07:00
committed by android-build-merger
2 changed files with 10 additions and 0 deletions

View File

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

View File

@@ -1177,6 +1177,15 @@ public class SubscriptionManager {
}
/**
* Get an array of Subscription Ids for specified slot Index.
* @param slotIndex the slot Index.
* @return subscription Ids or null if the given slot Index is not valid.
*/
public static int[] getSubscriptionIds(int slotIndex) {
return getSubId(slotIndex);
}
/** @hide */
@UnsupportedAppUsage
public static int[] getSubId(int slotIndex) {