commit 588cd6ac3008a0fa0220ebda6791d33d1178d5b8
author Pinyao Ting <pinyaoting@google.com> Thu Sep 28 04:00:13 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 28 04:00:13 2023 +0000
tree 03247501feea79ec6273bc3dea4c84292bfebc85
parent 0c816c738d2386a461670e734f9d5ac643b4f7be
parent 2da64fb9ee3cd65a6c81f3c14f9f7a5c3d7ac4aa

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>

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 557d57e..2eacf7a 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) {