| commit | bb3d9781134fb8003128b3f59cf7064dd58bc264 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 06 10:31:36 2024 -0800 |
| committer | Xin Li <delphij@google.com> | Wed Nov 06 10:31:36 2024 -0800 |
| tree | 6c6dc2d02acc51d1076411228f276b6d18b3ae48 | |
| parent | 6a3585fe749e79bdceea1c65791f6373124ce4b9 [diff] | |
| parent | 359595622d936e186fa4552fc366d401dd08a4fe [diff] |
Merge 24Q4 (ab/12406339) into aosp-main-future Bug: 370570306 Merged-In: Ic8c973caac761882481a6b2be319f41497012095 Change-Id: I2d67e4eac399528e93b675a17274fa79bf870e9b
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();