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

Commit fec1058e authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Expose getActiveSubscriptionInfoForIcc for Mainline"

parents 0cb441c5 b086534d

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10060,6 +10060,7 @@ package android.telephony { 
    method public boolean canManageSubscription(@Nullable android.telephony.SubscriptionInfo, @Nullable String);

    method @NonNull public int[] getActiveAndHiddenSubscriptionIdList();

    method @NonNull public int[] getActiveSubscriptionIdList();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForIcc(@NonNull String);

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

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEnabledSubscriptionId(int);

    method @NonNull public static android.content.res.Resources getResourcesForSubId(@NonNull android.content.Context, int);

telephony/java/android/telephony/SubscriptionManager.java

+7 −2
Original line number Diff line number Diff line
@@ -1199,12 +1199,17 @@ public class SubscriptionManager { 
    }



    /**

     * Get the active SubscriptionInfo associated with the iccId

     * Gets an active SubscriptionInfo {@link SubscriptionInfo} associated with the Sim IccId.

     *

     * @param iccId the IccId of SIM card

     * @return SubscriptionInfo, maybe null if its not active

     *

     * @hide

     */

    public SubscriptionInfo getActiveSubscriptionInfoForIccIndex(String iccId) {

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @Nullable

    @SystemApi

    public SubscriptionInfo getActiveSubscriptionInfoForIcc(@NonNull String iccId) {

        if (VDBG) logd("[getActiveSubscriptionInfoForIccIndex]+ iccId=" + iccId);

        if (iccId == null) {

            logd("[getActiveSubscriptionInfoForIccIndex]- null iccid");