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

Merge "Remove static for getSubscriptionIds" am: 9a9dbf05e0

Browse Source 
am: 0be2ef9746

Change-Id: I05f6d006c949cce7a4604390ec2a4cb170b5ffa5
This commit is contained in:
Shuo Qian
2018-11-30 12:47:20 -08:00
committed by android-build-merger
parent 745d594b58 0be2ef9746
commit 1054427c0c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -42844,7 +42844,7 @@ package android.telephony {
method public static int getDefaultVoiceSubscriptionId();
method public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions();
method public static int getSlotIndex(int);
method public static int[] getSubscriptionIds(int);
method public int[] getSubscriptionIds(int);
method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);
method public boolean isActiveSubscriptionId(int);
method public boolean isNetworkRoaming(int);

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

@@ -1426,7 +1426,7 @@ public class SubscriptionManager {
* subscriptions in the slot.
*/
@Nullable
public static int[] getSubscriptionIds(int slotIndex) {
public int[] getSubscriptionIds(int slotIndex) {
return getSubId(slotIndex);
}