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

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

Change-Id: I5cea557d53c94b2ca6585685964da161baf135e7
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:05:43 +00:00
committed by Automerger Merge Worker

View File

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