summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPinyao Ting <pinyaoting@google.com>2023-09-28 01:56:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-28 01:56:57 +0000
commit2da64fb9ee3cd65a6c81f3c14f9f7a5c3d7ac4aa (patch)
tree1725b5c13421134eea49bf3f092f170da5571c59
parente2d76ce0a1681a1bb4fd85703040b41a10deecc5 (diff)
parentc08b5f47606f737188af07310b0e87241a4f5029 (diff)
downloadLauncher3-2da64fb9ee3cd65a6c81f3c14f9f7a5c3d7ac4aa.tar.gz
Fix permission bypass in legacy shortcut am: b7b192bd7f am: a30a52e708 am: 7446209d60 am: c08b5f4760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24751391 Change-Id: I91cfe8344b819d1ae94a7110f99e37b4b116e7dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--src/com/android/launcher3/util/PackageManagerHelper.java11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index 1bcdab1426..e44f682516 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -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) {