From 981d9955fde6cc71c7fe2a9ef00d81a532f41183 Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Mon, 31 May 2021 08:01:32 +0000 Subject: [PATCH] Revert "Add MATCH_ANY_USER flag when get valid package uid" Revert "Ensure getting UID/GID checks the installed state" Revert submission 14700843-b186180067_main Reason for revert: Break WM presubmit (b/189728752) Reverted Changes: I3d7c35dc2:Add the checking of the package installed state I035eeca76:Ensure getting UID/GID checks the installed state Iaac8e56f3:Use userId to query the package uid instead of 0. I0c452d880:Add MATCH_ANY_USER flag when get valid package uid... Change-Id: Icdecda29da253cb14ab8294c16dab3ad03d97256 --- .../server/accessibility/AccessibilitySecurityPolicy.java | 4 +--- .../server/accessibility/AccessibilitySecurityPolicyTest.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java b/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java index 565193a8ad952..dc2628f0bc0bf 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java @@ -444,10 +444,8 @@ public class AccessibilitySecurityPolicy { private boolean isValidPackageForUid(String packageName, int uid) { final long token = Binder.clearCallingIdentity(); try { - // Since we treat calls from a profile as if made by its parent, using - // MATCH_ANY_USER to query the uid of the given package name. return uid == mPackageManager.getPackageUidAsUser( - packageName, PackageManager.MATCH_ANY_USER, UserHandle.getUserId(uid)); + packageName, UserHandle.getUserId(uid)); } catch (PackageManager.NameNotFoundException e) { return false; } finally { diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilitySecurityPolicyTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilitySecurityPolicyTest.java index 5e8e3f14f9c5d..ee00cb24a991e 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilitySecurityPolicyTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilitySecurityPolicyTest.java @@ -261,8 +261,8 @@ public class AccessibilitySecurityPolicyTest { @Test public void resolveValidReportedPackage_uidAndPkgNameMatched_returnPkgName() throws PackageManager.NameNotFoundException { - when(mMockPackageManager.getPackageUidAsUser(PACKAGE_NAME, - PackageManager.MATCH_ANY_USER, TEST_USER_ID)).thenReturn(APP_UID); + when(mMockPackageManager.getPackageUidAsUser(PACKAGE_NAME, TEST_USER_ID)) + .thenReturn(APP_UID); assertEquals(mA11ySecurityPolicy.resolveValidReportedPackageLocked( PACKAGE_NAME, APP_UID, TEST_USER_ID, APP_PID),