commit d54f9f3a1772020ff51a7b54b72112dfd0fc3e14
author Shuo Qian <shuoq@google.com> Tue Dec 03 23:40:18 2019 +0000
committer Shuo Qian <shuoq@google.com> Fri Dec 06 19:58:52 2019 +0000
tree 67e27a111f08bac58d70e94ea831e66cdf4744be
parent c96c8748136b2bb46d3a471ea2e90018e1d4e8e7

Make getPackagesWithCarrierPrivilgesForAllPhones System API

Test: build
Bug: 145550382
Change-Id: Ie3ca4ba8e16938e769b75f2f1cac2737145e47a6
Merged-In: Ie3ca4ba8e16938e769b75f2f1cac2737145e47a6
(cherry picked from commit 067a06d5dcb3999595152fb2702ce32c92462e45)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 552c490..a3e9070 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5235,9 +5235,17 @@
 
     @Override
     public List<String> getPackagesWithCarrierPrivilegesForAllPhones() {
+        enforceReadPrivilegedPermission("getPackagesWithCarrierPrivilegesForAllPhones");
+
+        final long identity = Binder.clearCallingIdentity();
+
         List<String> privilegedPackages = new ArrayList<>();
-        for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
-           privilegedPackages.addAll(getPackagesWithCarrierPrivileges(i));
+        try {
+            for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
+                privilegedPackages.addAll(getPackagesWithCarrierPrivileges(i));
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
         return privilegedPackages;
     }