diff options
| author | Peter Wang <tpwang@google.com> | 2020-03-16 04:45:23 -0700 |
|---|---|---|
| committer | Peter Wang <tpwang@google.com> | 2020-07-16 02:01:06 -0700 |
| commit | c061cdf46774e740707a9c364b86068a04985664 (patch) | |
| tree | 3487566cd1f3e907b198480c691ff74b08c0fc2f /telephony | |
| parent | 06b1ba180d1f0ae2ee66516ca782f65934fb0950 (diff) | |
[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and
guard with permission
Bug: 150878235
Fix: 150878235
Test: Build
Change-Id: I7f3b1f5170e032336d9b39b322c49e2b92573586
Merged-In: I7f3b1f5170e032336d9b39b322c49e2b92573586
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/common/com/android/internal/telephony/TelephonyPermissions.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java index fff6696604dc..717a59c4d3ab 100644 --- a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java +++ b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java @@ -648,7 +648,7 @@ public final class TelephonyPermissions { private static boolean checkCarrierPrivilegeForAnySubId(Context context, int uid) { SubscriptionManager sm = (SubscriptionManager) context.getSystemService( Context.TELEPHONY_SUBSCRIPTION_SERVICE); - int[] activeSubIds = sm.getActiveSubscriptionIdList(/* visibleOnly */ false); + int[] activeSubIds = sm.getCompleteActiveSubscriptionIdList(); for (int activeSubId : activeSubIds) { if (getCarrierPrivilegeStatus(context, activeSubId, uid) == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) { diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 7f2c6c17d508..f79630c0ee8c 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -2183,6 +2183,7 @@ public class SubscriptionManager { * @hide */ @SystemApi + @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public @NonNull int[] getActiveSubscriptionIdList() { return getActiveSubscriptionIdList(/* visibleOnly */ true); } @@ -2200,7 +2201,8 @@ public class SubscriptionManager { * @hide */ @SystemApi - public @NonNull int[] getActiveAndHiddenSubscriptionIdList() { + @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) + public @NonNull int[] getCompleteActiveSubscriptionIdList() { return getActiveSubscriptionIdList(/* visibleOnly */false); } |