commit a01881b6b608b69adaa491de2e05ba35508a10d2
author Mark Renouf <mrenouf@google.com> Thu Mar 09 16:07:00 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 09 16:07:00 2023 +0000
tree 8fdd1723d17ab3adfb5ca169f8ec4b6ce1ddc7e4
parent c72ea6b30f509aba1824a0091cfbc52fac03243d
parent f26e1728d90c8ba217c383ff573aa4bf485ac04c

Merge "Fix permission check for unbundled sharesheet" into tm-qpr-dev

services/core/java/com/android/server/pm/ShortcutService.java

diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index 7fc46fd..a2b2983 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -1641,7 +1641,7 @@
             return false;
         }
         int uid = injectGetPackageUid(systemChooser.getPackageName(), UserHandle.USER_SYSTEM);
-        return uid == callingUid;
+        return UserHandle.getAppId(uid) == UserHandle.getAppId(callingUid);
     }
 
     private void enforceSystemOrShell() {