Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0be2ef97 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Remove static for getSubscriptionIds" 

am: 9a9dbf05

Change-Id: I22d43fc27ab74f21e2718905281b7cd30ad802cc
parents dfdc3a2d 9a9dbf05

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

telephony/java/android/telephony/SubscriptionManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }