commit 1a8ddecaa05e4a7a03f4fe7190955d3dcadffd23
author Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> Tue Oct 10 15:11:13 2023 +0530
committer Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> Wed Oct 11 13:10:26 2023 +0200
tree d6c2bf455ed5d6e453233b0c2d2d499be1913e06
parent 7e36f4b6c35d0de70895f759bc4e11377471ad5c
parent 2ca898f5601601b26adf3ffbb78c1a20c0a161b9

Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Fix permission issue in legacy shortcut

Change-Id: I7c70ceb7647ed8cf39cd01a7eb1c529e9a9902ef

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 86f3431..02287fd 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -153,6 +153,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