commit 8f0e2fc3a09d9bc65eb3002d3c2494e5ef277b4c
author Yan Yan <evitayan@google.com> Tue Oct 01 23:59:21 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 01 23:59:21 2024 +0000
tree 9335bc26fa74e23d986ee359cf3166d17303c824
parent c591aa27c03479e99d3236f7f8740214c1218798
parent 965c84f3148392e87bafcce3adfda99a003dfc7b

Merge "Enforce FEATURE_TELEPHONY_SUBSCRIPTION in getPackagesWithCarrierPrivileges" into main

src/com/android/phone/PhoneInterfaceManager.java

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();