| commit | 6a3585fe749e79bdceea1c65791f6373124ce4b9 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Wed Oct 02 00:32:52 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 02 00:32:52 2024 +0000 |
| tree | 9335bc26fa74e23d986ee359cf3166d17303c824 | |
| parent | 614438446596a6aea8507c679bbb55027c153709 [diff] | |
| parent | 8f0e2fc3a09d9bc65eb3002d3c2494e5ef277b4c [diff] |
Merge "Enforce FEATURE_TELEPHONY_SUBSCRIPTION in getPackagesWithCarrierPrivileges" into main am: 8f0e2fc3a0 Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/3281131 Change-Id: If7dd5c0e5141fcd8c4213bd76aa513f9d2d25937 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java index dc4290d..4bd6be0 100644 --- a/src/com/android/phone/PhoneInterfaceManager.java +++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7695,6 +7695,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();