summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPinyao Ting <pinyaoting@google.com>2023-09-28 05:50:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-28 05:50:43 +0000
commitbb1130054552de0381a24c28ce206a0023a5ea24 (patch)
tree9f196a11ffab51e448ea30778d889b40127690cd
parent7c15fcab12feeae4eadb3081bad88fa42f5a43f4 (diff)
parent588cd6ac3008a0fa0220ebda6791d33d1178d5b8 (diff)
downloadLauncher3-bb1130054552de0381a24c28ce206a0023a5ea24.tar.gz
Fix permission bypass in legacy shortcut am: b7b192bd7f am: a30a52e708 am: 7446209d60 am: c08b5f4760 am: 2da64fb9ee am: 588cd6ac30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24751391 Change-Id: I7340004ed1402e4f19d2749285e4c5cd72cfd641 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 557d57e2d2..2eacf7a002 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) {