diff options
| author | Peter Wang <tpwang@google.com> | 2020-07-31 08:43:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-07-31 08:43:44 +0000 |
| commit | 8ba18c0508e809cfe6fde90a60bda357b244cb49 (patch) | |
| tree | f9ec147ad73a51c8934bfdee7949a21f23173dca /telephony/common | |
| parent | e5e46c6dfda90017e43b7c1c579b2099647bb004 (diff) | |
| parent | c061cdf46774e740707a9c364b86068a04985664 (diff) | |
Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission"
Diffstat (limited to 'telephony/common')
| -rw-r--r-- | telephony/common/com/android/internal/telephony/TelephonyPermissions.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java index 82725032eb44..0f53fe65463f 100644 --- a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java +++ b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java @@ -650,7 +650,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) { |