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

Commit 76131d77 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Expose getActiveSubscriptionInfoForIcc for Mainline" am: 6a2dab68 am: 545283a8 

Change-Id: I838e73a328a4965b4a0b2217d57274feb97961d9
parents 0d531492 545283a8

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8894,6 +8894,7 @@ package android.telephony { 














  public class SubscriptionManager {















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean canDisablePhysicalSubscription();













    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








@@ -1197,12 +1197,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");