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

Merge "Expose getActiveSubscriptionInfoForIcc for Mainline"

Browse Source
This commit is contained in:
Shuo Qian
2020-01-07 21:27:31 +00:00
committed by Android (Google) Code Review
parent 0cb441c56a b086534dbe
commit fec1058e9b
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

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

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