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

Expose getActiveSubscriptionInfoForIcc for Mainline

Browse Source 
Test: cts; treehugger
Bug: 122015219
Change-Id: I900e36fafe009206ec7431220603fcb8f404e33e
This commit is contained in:
Shuo Qian
2020-01-03 13:25:16 -08:00
parent f8143c2042
commit b086534dbe
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

@@ -10030,6 +10030,7 @@ package android.telephony {
method public boolean canManageSubscription(@Nullable android.telephony.SubscriptionInfo, @Nullable String); method public boolean canManageSubscription(@Nullable android.telephony.SubscriptionInfo, @Nullable String);
method @NonNull public int[] getActiveAndHiddenSubscriptionIdList(); method @NonNull public int[] getActiveAndHiddenSubscriptionIdList();
method @NonNull public int[] getActiveSubscriptionIdList(); 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 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

@@ -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 * @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");