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

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

Merge "Make SubscriptionManager.isActiveSubId public" am: fafc51a0 

am: a4107d39

Change-Id: Iff157bac8d07cbf686089fbdaf8c58c17d10e527
parents 5017286a a4107d39

api/current.txt

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

    method public static int[] getSubscriptionIds(int);

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

    method public boolean isActiveSubscriptionId(int);

    method public boolean isNetworkRoaming(int);

    method public static boolean isValidSubscriptionId(int);

    method public void removeOnOpportunisticSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);

telephony/java/android/telephony/SubscriptionManager.java

+14 −1
Original line number Diff line number Diff line
@@ -1846,6 +1846,19 @@ public class SubscriptionManager { 
        return new Resources(context.getResources().getAssets(), newMetrics, newConfig);

    }



    /**

     * Checks if the supplied subscription ID corresponds to an active subscription.

     *

     * @param subscriptionId the subscription ID.

     * @return {@code true} if the supplied subscription ID corresponds to an active subscription;

     * {@code false} if it does not correspond to an active subscription; or throw a

     * SecurityException if the caller hasn't got the right permission.

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    public boolean isActiveSubscriptionId(int subscriptionId) {

        return isActiveSubId(subscriptionId);

    }



    /**

     * @return true if the sub ID is active. i.e. The sub ID corresponds to a known subscription

     * and the SIM providing the subscription is present in a slot and in "LOADED" state.
@@ -1856,7 +1869,7 @@ public class SubscriptionManager { 
        try {

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

            if (iSub != null) {

                return iSub.isActiveSubId(subId);

                return iSub.isActiveSubId(subId, mContext.getOpPackageName());

            }

        } catch (RemoteException ex) {

        }

telephony/java/com/android/internal/telephony/ISub.aidl

+1 −1
Original line number Diff line number Diff line
@@ -232,5 +232,5 @@ interface ISub { 
     */

    int getSimStateForSlotIndex(int slotIndex);



    boolean isActiveSubId(int subId);

    boolean isActiveSubId(int subId, String callingPackage);

}