Fix permission bypass in legacy shortcut am: b7b192bd7f am: a30a52e708 am: 7446209d60 am: c08b5f4760 am: 2da64fb9ee

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24751391

Change-Id: I50538435c008e2fd71ada5ffcb011d43eca92178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pinyao Ting
2023-09-28 04:00:13 +00:00
committed by Automerger Merge Worker

View File

@@ -138,15 +138,8 @@ public class PackageManagerHelper {
public boolean hasPermissionForActivity(Intent intent, String srcPackage) {
// b/270152142
if (Intent.ACTION_CHOOSER.equals(intent.getAction())) {
final Bundle extras = intent.getExtras();
if (extras == null) {
return true;
}
// If given intent is ACTION_CHOOSER, verify srcPackage has permission over EXTRA_INTENT
intent = (Intent) extras.getParcelable(Intent.EXTRA_INTENT);
if (intent == null) {
return true;
}
// Chooser shortcuts is not a valid target
return false;
}
ResolveInfo target = mPm.resolveActivity(intent, 0);
if (target == null) {