Merge cherrypicks of ['googleplex-android-review.googlesource.com/24815763'] into tm-platform-release.
Change-Id: I6da66db37d016ee251006d58a77124998e06d23e
This commit is contained in:
commit
301971b900
|
@ -147,15 +147,8 @@ public class PackageManagerHelper {
|
||||||
public boolean hasPermissionForActivity(Intent intent, String srcPackage) {
|
public boolean hasPermissionForActivity(Intent intent, String srcPackage) {
|
||||||
// b/270152142
|
// b/270152142
|
||||||
if (Intent.ACTION_CHOOSER.equals(intent.getAction())) {
|
if (Intent.ACTION_CHOOSER.equals(intent.getAction())) {
|
||||||
final Bundle extras = intent.getExtras();
|
// Chooser shortcuts is not a valid target
|
||||||
if (extras == null) {
|
return false;
|
||||||
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);
|
ResolveInfo target = mPm.resolveActivity(intent, 0);
|
||||||
if (target == null) {
|
if (target == null) {
|
||||||
|
|
Loading…
Reference in New Issue