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

resolve merge conflicts of b96891b805 to master

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Bug: 113072551
Change-Id: I0077bfea84e5ff9a37bfc8c84c7d1d38872f3561
This commit is contained in:
sqian
2018-09-06 16:02:48 -07:00
committed by Shuo Qian
parent d54ad2ee80 b96891b805
commit 7fde1c770b
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -42624,6 +42624,7 @@ package android.telephony {
method public static int getDefaultSubscriptionId();
method public static int getDefaultVoiceSubscriptionId();
method public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions(int);
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);

9
telephony/java/android/telephony/SubscriptionManager.java
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) {