commit 96f8a0fc810576964b900e5bece59d82ec28146d
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Oct 11 22:51:45 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Oct 11 22:51:45 2023 +0000
tree fddfe7d16c47b579673f101b3a890df57c1e9dc0
parent 0e3f63d375831a98606ef25393edf04d9f585467
parent 6c9a41117d5a9365cf34e770bbb00138f6bf997e

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24751391'] into security-aosp-tm-release.

Change-Id: I1048f60118a277ce83d2b705dcbf858fdd064603

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) {