Unverified Commit bf9a1b62 authored Dec 05, 2023 by Michael Bestas

Merge tag 'android-security-13.0.0_r12' into staging/lineage-20.0_merge-android-security-13.0.0_r12

Android Security 13.0.0 Release 12 (10993242)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZW4XygAKCRDorT+BmrEO
# eKkEAJ0cNiJvFUt3yQb3JSjqfED8DXjbFgCgj8ulr9NPzQurzDT/FokGXrxr8KQ=
# =M4dn
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Dec  4 20:17:46 2023 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2098 signatures in the past
#      2 years.  Encrypted 4 messages in the past 23 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Pinyao Ting
# Via Android Build Coastguard Worker
* tag 'android-security-13.0.0_r12':
  Fix permission bypass in legacy shortcut

Change-Id: I24bf642eeacdc0b01febe4fd15cc85ab45feeaf9

parents 515f3c10 96f8a0fc

src/com/android/launcher3/util/PackageManagerHelper.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -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) {