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

Change-Id: I6da66db37d016ee251006d58a77124998e06d23e
This commit is contained in:
Android Build Coastguard Worker 2023-10-13 19:41:48 +00:00
commit 301971b900
1 changed files with 2 additions and 9 deletions

View File

@ -147,15 +147,8 @@ public class PackageManagerHelper {
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) {