diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-01 13:38:30 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-01 13:38:30 +0000 |
commit | d05e597d5d3dc74e62d7cac4d7463014994980a7 (patch) | |
tree | 1554435a5363eb8c07f235003aeabef981c47bc8 | |
parent | 549c2a0badfa45a0f8abfef8cedad9922914fadc (diff) | |
parent | 8555fcfcf9d3bd1db9746c03b75aaa576315e770 (diff) | |
download | Launcher3-android13-qpr3-c-s12-release.tar.gz |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23566423'] into tm-qpr3-c-release.android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-release
Change-Id: Id3df96f7f1b9eda0f088e0b724f34905e087b432
-rw-r--r-- | src/com/android/launcher3/util/PackageManagerHelper.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java index a6a2751dc7..586e0c9e89 100644 --- a/src/com/android/launcher3/util/PackageManagerHelper.java +++ b/src/com/android/launcher3/util/PackageManagerHelper.java @@ -145,6 +145,18 @@ public class PackageManagerHelper { * 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 |