commit c08b5f47606f737188af07310b0e87241a4f5029
author Pinyao Ting <pinyaoting@google.com> Wed Sep 27 23:48:53 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 27 23:48:53 2023 +0000
tree b54155afcfc36832623c786f4cbb97e04da46138
parent d9bb5cd96ff94822b5ebe5c1375d8634accf2557
parent 7446209d60dfc2c3923c37a7ad3a7b2f82c113e7

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

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

Change-Id: I2cdd5612284d653c50020cc048f70589a4f370ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/util/PackageManagerHelper.java

diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index 1bcdab1..e44f682 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -138,15 +138,8 @@
     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) {