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

Commit ea2cc726 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove static for getSubscriptionIds"

parents 11c16864 705dec52

api/current.txt

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

    }