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

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

Merge "Make SubscriptionManager.getSlotIndex public"

parents 7f6aace7 e29d4a7f

api/current.txt

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

    method public static int getDefaultSmsSubscriptionId();

    method public static int getDefaultSubscriptionId();

    method public static int getDefaultSubscriptionId();

    method public static int getDefaultVoiceSubscriptionId();

    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.SubscriptionInfo> getOpportunisticSubscriptions(int);

    method public static int[] getSubscriptionIds(int);

    method public static int[] getSubscriptionIds(int);

    method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);

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

    field public static final int DATA_ROAMING_ENABLE = 1; // 0x1

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

    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 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

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

  }

  }































telephony/java/android/telephony/SubscriptionManager.java



+9
−10




























Original line number
Original line
Diff line number
Diff line








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









    /** @hide */







    /** @hide */











    public static final int INVALID_PHONE_INDEX = -1;







    public static final int INVALID_PHONE_INDEX = -1;































    /** An invalid slot identifier */







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











    /** @hide */














    public static final int INVALID_SIM_SLOT_INDEX = -1;







    public static final int INVALID_SIM_SLOT_INDEX = -1;































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







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










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





























    /**







    /**











     * Get slotIndex associated with the subscription.







     * 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







     * @param subscriptionId the unique SubscriptionInfo index in database











     * @hide







     * @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 subscriptionId) {











    public static int getSlotIndex(int subId) {







        if (!isValidSubscriptionId(subscriptionId)) {











        if (!isValidSubscriptionId(subId)) {














            if (DBG) {







            if (DBG) {











                logd("[getSlotIndex]- fail");







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











            }







            }











        }







        }





























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









        try {







        try {











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







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











            if (iSub != null) {







            if (iSub != null) {











                result = iSub.getSlotIndex(subId);







                result = iSub.getSlotIndex(subscriptionId);











            }







            }











        } catch (RemoteException ex) {







        } catch (RemoteException ex) {











            // ignore it







            // ignore it