commit 1979a04c1ee5511f2f5cf2dce5b75fec9e90e15e
author Jordan Liu <jminjie@google.com> Fri Mar 20 21:39:35 2020 +0000
committer Jordan Liu <jminjie@google.com> Fri Mar 20 21:39:56 2020 +0000
tree ccbf9af45bd633dad99d50adbda89c57501127e2
parent 102b27765aadb26935faa9b89bb0c784d019fd18

Revert "Check UID in getUiccCardsInfoSecurity"

This reverts commit 102b27765aadb26935faa9b89bb0c784d019fd18.

Reason for revert: b/150979331

Change-Id: Ia8210c0303b435e2d8b2dfb12a9ab71e632c0438
Bug: 150979331

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1b968a9..0e909a6 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -120,7 +120,6 @@
 
 import com.android.ims.ImsManager;
 import com.android.ims.internal.IImsServiceFeatureCallback;
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.telephony.CallForwardInfo;
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CallStateException;
@@ -1618,8 +1617,7 @@
     }
 
     /** Private constructor; @see init() */
-    @VisibleForTesting
-    /* package */ PhoneInterfaceManager(PhoneGlobals app) {
+    private PhoneInterfaceManager(PhoneGlobals app) {
         mApp = app;
         mCM = PhoneGlobals.getInstance().mCM;
         mImsResolver = PhoneGlobals.getInstance().getImsResolver();
@@ -7448,15 +7446,6 @@
 
     @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);
-        }
         boolean hasReadPermission = false;
         try {
             enforceReadPrivilegedPermission("getUiccCardsInfo");