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

Commit 7fde1c77 authored by sqian's avatar sqian Committed by Shuo Qian
Browse files

resolve merge conflicts of b96891b8 to master 

Test: I solemnly swear I tested this conflict resolution.
Bug: 113072551
Change-Id: I0077bfea84e5ff9a37bfc8c84c7d1d38872f3561
parents d54ad2ee b96891b8

api/current.txt

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

telephony/java/android/telephony/SubscriptionManager.java

+9 −0
Original line number Diff line number Diff line
@@ -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) {