Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose getActiveSubscriptionInfoForIcc for Mainline" am: 6a2dab6878 am: 545283a8d2

Browse Source 
Change-Id: I838e73a328a4965b4a0b2217d57274feb97961d9
This commit is contained in:
Automerger Merge Worker
2020-01-08 00:18:06 +00:00
parent 0d5314922c 545283a8d2
commit 76131d7715
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -8894,6 +8894,7 @@ package android.telephony {
public class SubscriptionManager { public class SubscriptionManager {
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean canDisablePhysicalSubscription(); 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 public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEnabledSubscriptionId(int); 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); method @NonNull public static android.content.res.Resources getResourcesForSubId(@NonNull android.content.Context, int);

9
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -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 * @param iccId the IccId of SIM card
* @return SubscriptionInfo, maybe null if its not active * @return SubscriptionInfo, maybe null if its not active
*
* @hide * @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 (VDBG) logd("[getActiveSubscriptionInfoForIccIndex]+ iccId=" + iccId);
if (iccId == null) { if (iccId == null) {
logd("[getActiveSubscriptionInfoForIccIndex]- null iccid"); logd("[getActiveSubscriptionInfoForIccIndex]- null iccid");