| commit | 3b42f0a61dc9035ebdc0100aade4a5bbc891e26e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 21 15:10:05 2024 -0800 |
| committer | Xin Li <delphij@google.com> | Thu Nov 21 15:10:05 2024 -0800 |
| tree | 3eafe840571d408dae8175a4bee8f8ac38507f8e | |
| parent | bb3d9781134fb8003128b3f59cf7064dd58bc264 [diff] | |
| parent | beb9948ce89c8303309717958fab6349469e8cdc [diff] |
Merge ab/AP4A.240925.013 into aosp-main-future Bug: 370570306 Merged-In: I3bfb6b322388c4f39e3370c6c1e1792dfe48ded4 Change-Id: I5e97d9c62c009eb82d9ff3632fb4064ba5717fb3
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java index 4624884..a997f01 100644 --- a/src/com/android/phone/PhoneInterfaceManager.java +++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7739,6 +7739,12 @@ @Override public List<String> getPackagesWithCarrierPrivileges(int phoneId) { enforceReadPrivilegedPermission("getPackagesWithCarrierPrivileges"); + + enforceTelephonyFeatureWithException( + getCurrentPackageName(), + PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, + "getPackagesWithCarrierPrivileges"); + Phone phone = PhoneFactory.getPhone(phoneId); if (phone == null) { return Collections.emptyList();