commit 3d9a6af325fe2f343a5267065317f4076624b133
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 01 12:08:24 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 01 12:08:24 2023 +0000
tree 1554435a5363eb8c07f235003aeabef981c47bc8
parent 8e6b5824dabe7a152e3b7cec256edf68d24f752e
parent 63b6ab6176d1d608d83d9ab73bc556f3aee6f8ee

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23566423'] into tm-qpr3-release.

Change-Id: I5b0a10f07fc4c638cd1c337bb7f25d3e7f2554b9

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 a6a2751..586e0c9 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -145,6 +145,18 @@
      * any permissions
      */
     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;
+            }
+        }
         ResolveInfo target = mPm.resolveActivity(intent, 0);
         if (target == null) {
             // Not a valid target