commit f5f1f4c96197b6fcdb69e73bdf5edfc68580fa4c
author Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> Thu Dec 14 15:30:26 2023 +0530
committer Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> Thu Dec 14 11:13:04 2023 +0100
tree b69865d276c2d398d767d272d4f586bd1427711e
parent 1a8ddecaa05e4a7a03f4fe7190955d3dcadffd23
parent 2c3b2dab60cf48b866397702d5fbe8e8783118ab

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

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

Change-Id: Ic3c41cb8a61247759f312678de92f2354feb9661

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 02287fd..fc6a91d 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -155,15 +155,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) {