diff options
| author | 2020-01-07 23:48:56 +0000 | |
|---|---|---|
| committer | 2020-01-07 23:48:56 +0000 | |
| commit | 6a2dab6878b99b9f45156033755ce6af9a6f3e8d (patch) | |
| tree | 87bd79140620c1c433fdd7542a1161a738330f2d | |
| parent | 18077c1587fd890e528b482d2a11f506551dec8b (diff) | |
| parent | ff8dfe7eb26b16d3daeb3a15826e3b01feb2f7d9 (diff) | |
Merge "Expose getActiveSubscriptionInfoForIcc for Mainline"
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index e62360ef393b..26e66730cb91 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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); diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index d152cad966ce..c6142d9d1d93 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -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"); |