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

Commit 719310cd authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Make SubscriptionManager.getSlotIndex public"

parents a8f2601d 996a318e

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -42636,6 +42636,7 @@ package android.telephony { 
    method public static int getDefaultSmsSubscriptionId();

    method public static int getDefaultSubscriptionId();

    method public static int getDefaultVoiceSubscriptionId();

    method public static int getSlotIndex(int);

    method public static int[] getSubscriptionIds(int);

    method public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions(int);

    method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);
@@ -42657,6 +42658,7 @@ package android.telephony { 
    field public static final int DATA_ROAMING_ENABLE = 1; // 0x1

    field public static final int DEFAULT_SUBSCRIPTION_ID = 2147483647; // 0x7fffffff

    field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX";

    field public static final int INVALID_SIM_SLOT_INDEX = -1; // 0xffffffff

    field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff

  }

























telephony/java/android/telephony/SubscriptionManager.java



+9
−10




























Original line number
Diff line number
Diff line








@@ -88,8 +88,7 @@ public class SubscriptionManager {













    /** @hide */















    public static final int INVALID_PHONE_INDEX = -1;





























    /** An invalid slot identifier */













    /** @hide */













    /** Indicates invalid sim slot. This can be returned by {@link #getSlotIndex(int)}. */















    public static final int INVALID_SIM_SLOT_INDEX = -1;































    /** Indicates the default subscription ID in Telephony. */










@@ -1310,15 +1309,15 @@ public class SubscriptionManager {





























    /**















     * Get slotIndex associated with the subscription.













     * @return slotIndex as a positive integer or a negative value if an error either













     * SIM_NOT_INSERTED or < 0 if an invalid slot index













     * @hide













     *













     * @param subscriptionId the unique SubscriptionInfo index in database













     * @return slotIndex as a positive integer or {@link #INVALID_SIM_SLOT_INDEX} if the supplied













     * subscriptionId doesn't have an associated slot index.















     */













    @UnsupportedAppUsage













    public static int getSlotIndex(int subId) {













        if (!isValidSubscriptionId(subId)) {













    public static int getSlotIndex(int subscriptionId) {













        if (!isValidSubscriptionId(subscriptionId)) {















            if (DBG) {













                logd("[getSlotIndex]- fail");













                logd("[getSlotIndex]- supplied subscriptionId is invalid.");















            }















        }

























@@ -1327,7 +1326,7 @@ public class SubscriptionManager {













        try {















            ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));















            if (iSub != null) {













                result = iSub.getSlotIndex(subId);













                result = iSub.getSlotIndex(subscriptionId);















            }















        } catch (RemoteException ex) {















            // ignore it