From dcea3c5d4d0eb7542ce8693f09d578334b11889a Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Mon, 31 May 2021 08:01:32 +0000 Subject: [PATCH] Revert "Use userId to query the package uid instead of 0." 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: Id961177c1b533d8fd8e3e46486d8235690bad7bb --- .../core/java/com/android/server/am/ActivityManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index b2be61ac48606..44c64ef96d3fa 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4137,7 +4137,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (appId < 0 && packageName != null) { try { appId = UserHandle.getAppId(AppGlobals.getPackageManager() - .getPackageUid(packageName, MATCH_DEBUG_TRIAGED_MISSING, userId)); + .getPackageUid(packageName, MATCH_DEBUG_TRIAGED_MISSING, 0)); } catch (RemoteException e) { } }