commit 80cbcb475006eb758b38bbcec4b6bc0859af9c51
author Kevin F. Haggerty <haggertk@lineageos.org> Sat Sep 16 08:37:03 2023 -0600
committer Kevin F. Haggerty <haggertk@lineageos.org> Sat Sep 16 08:37:03 2023 -0600
tree 74f842d03d9d1dfe91e10508ba3ee42936887ef3
parent f1b03d523bba4bdd3d7302eed7c9bd461eef3f3d
parent 0e3f63d375831a98606ef25393edf04d9f585467

Merge tag 'android-security-13.0.0_r9' of https://android.googlesource.com/platform/packages/apps/Launcher3 into staging/lineage-20.0_merge_android-security-13.0.0_r9

Android security 13.0.0 release 9

* tag 'android-security-13.0.0_r9' of https://android.googlesource.com/platform/packages/apps/Launcher3:
  Fix permission issue in legacy shortcut

Change-Id: I783d680052a324dbe46d3ca716cf7b2c11a95f3d

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