commit 80280b24dd7f47ed3f755480c003be687b8e24e2
author Jordan Liu <jminjie@google.com> Mon May 04 23:14:52 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 04 23:14:52 2020 +0000
tree 745b7e93d81db78774f0c8b6f9256c9145cc50ed
parent 3770f398fb7cc97acdd9134cf69e6056b9037e74
parent db3173c72b57f6ce6ce372048cab1b03c0dca693

Merge "Used checkPackage to check UID and package" into qt-dev am: db3173c72b

Change-Id: I1a8d298d6c1dd7405007ac47aa1ca9dae53c72db

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f8541bc..31eea78 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6488,15 +6488,10 @@
 
     @Override
     public List<UiccCardInfo> getUiccCardsInfo(String callingPackage) {
-        try {
-            PackageManager pm = mApp.getPackageManager();
-            if (Binder.getCallingUid() != pm.getPackageUid(callingPackage, 0)) {
-                throw new SecurityException("Calling package " + callingPackage + " does not match "
-                        + "calling UID");
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            throw new SecurityException("Invalid calling package. e=" + e);
-        }
+        // Verify that tha callingPackage belongs to the calling UID
+        mApp.getSystemService(AppOpsManager.class)
+                .checkPackage(Binder.getCallingUid(), callingPackage);
+
         boolean hasReadPermission = false;
         try {
             enforceReadPrivilegedPermission("getUiccCardsInfo");