Revert "Check UID in getUiccCardsInfoSecurity"
This reverts commit a39e6c1efb02ff9c19fb91beae9b548f5c1ecc78.
Reason for revert: b/150979331
Change-Id: I06e967d84ba60ea5c7958348740766ed95aaff0d
(cherry picked from commit 778da3d3ffb629f306d1ba34e294222d1c1199a1)
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f8541bc..435cd96 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -115,7 +115,6 @@
import com.android.ims.ImsException;
import com.android.ims.ImsManager;
import com.android.ims.internal.IImsServiceFeatureCallback;
-import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.CallManager;
import com.android.internal.telephony.CallStateException;
import com.android.internal.telephony.CarrierInfoManager;
@@ -1338,8 +1337,7 @@
}
/** Private constructor; @see init() */
- @VisibleForTesting
- /* package */ PhoneInterfaceManager(PhoneGlobals app) {
+ private PhoneInterfaceManager(PhoneGlobals app) {
mApp = app;
mCM = PhoneGlobals.getInstance().mCM;
mUserManager = (UserManager) app.getSystemService(Context.USER_SERVICE);
@@ -6488,15 +6486,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");
diff --git a/tests/src/com/android/phone/PhoneInterfaceManagerTest.java b/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
deleted file mode 100644
index 9f8de9e..0000000
--- a/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.phone;
-
-import static junit.framework.TestCase.fail;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-
-import android.content.pm.PackageManager;
-import android.os.Binder;
-import android.util.Log;
-
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.TelephonyTestBase;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(AndroidJUnit4.class)
-public class PhoneInterfaceManagerTest extends TelephonyTestBase {
-
- private static final String PRIVILEGED_PACKAGE_NAME = "test.package.name";
-
- private static final String TAG = "PhoneInterfaceManagerTest";
-
- private PhoneInterfaceManager mPhoneInterfaceManager;
- private PhoneGlobals mMockPhoneGlobals;
-
- @Before
- public void setUp() throws Exception {
- super.setUp();
- mMockPhoneGlobals = mock(PhoneGlobals.class);
- //PhoneGlobals phoneGlobals = new PhoneGlobals(mContext);
- mPhoneInterfaceManager = new PhoneInterfaceManager(mMockPhoneGlobals);
- }
-
- @After
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- @Test
- public void testGetUiccCardsInfoSecurity() {
- // Set up mocks so that the supplied package UID does not equal the calling UID
- PackageManager mockPackageManager = mock(PackageManager.class);
- try {
- doReturn(Binder.getCallingUid() + 1).when(mockPackageManager)
- .getPackageUid(eq(PRIVILEGED_PACKAGE_NAME), anyInt());
- } catch (Exception e) {
- Log.d(TAG, "testGetUiccCardsInfoSecurity unable to setup mocks");
- fail();
- }
- doReturn(mockPackageManager).when(mContext).getPackageManager();
- doReturn(mockPackageManager).when(mMockPhoneGlobals).getPackageManager();
- try {
- mPhoneInterfaceManager.getUiccCardsInfo(PRIVILEGED_PACKAGE_NAME);
- fail();
- } catch (SecurityException e) {
- Log.d(TAG, "testGetUiccCardsInfoSecurity e = " + e);
- }
- }
-}
