Merge "Fix permission check for unbundled sharesheet" into tm-qpr-dev am: a01881b6b6 am: dbf08d9512 am: 41e52208b2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21906439

Change-Id: Ied28f46039494dab488fbfc613f6d6fdf32dd9c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mark Renouf
2023-03-09 18:47:32 +00:00
committed by Automerger Merge Worker

View File

@@ -1645,7 +1645,7 @@ public class ShortcutService extends IShortcutService.Stub {
return false;
}
int uid = injectGetPackageUid(systemChooser.getPackageName(), UserHandle.USER_SYSTEM);
return uid == callingUid;
return UserHandle.getAppId(uid) == UserHandle.getAppId(callingUid);
}
private void enforceSystemOrShell() {