commit fb9a2d7ec555425b236585c6d955aeb99914f5c5
author Chen Xu <fionaxu@google.com> Fri Nov 02 17:29:30 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 02 17:29:30 2018 +0000
tree 8e3516385f6b1229a40bc5c8f981b40a68f1c9f4
parent a97f8b3998a8ca624f210955f6026af6931c9107
parent 7ee6786dc3dcbe6c395b59637d9dc18bae11786a

Merge "new hidden API to getCertsFromCarrierPrivilegeRules"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 84d7fba..5bb617e 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5670,4 +5670,24 @@
             Binder.restoreCallingIdentity(identity);
         }
     }
+
+    @Override
+    public List<String> getCertsFromCarrierPrivilegeAccessRules(int subId) {
+        enforceReadPrivilegedPermission("getCertsFromCarrierPrivilegeAccessRules");
+        Phone phone = getPhone(subId);
+        if (phone == null) {
+            return null;
+        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            UiccProfile profile = UiccController.getInstance()
+                    .getUiccProfileForPhone(phone.getPhoneId());
+            if (profile != null) {
+                return profile.getCertsFromCarrierPrivilegeAccessRules();
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+        return null;
+    }
 }