Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Unverified Commit fe8eba31 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-14.0.0_r17' into staging/lineage-21.0_merge-android-security-14.0.0_r17

Android Security 14.0.0 Release 17 (12787469)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ6D3BAAKCRDorT+BmrEO
# eGLcAJwNZGsWwfl73bpNFAnpzKcph012zACfWrQVoll8FZzCUpXCL8zp2SnoP/8=
# =bsru
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Feb  3 19:04:04 2025 EET
# gpg:using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Adam Bookatz (1) and others
# Via Android Build Coastguard Worker
* tag 'android-security-14.0.0_r17':
  [Safer intents] App Time Spent Preference
  Don't let profiles open the UserSettings overflow [DO NOT MERGE]
  Block the content scheme intent in AccountTypePreferenceLoader

 Conflicts:
	src/com/android/settings/spa/app/appinfo/AppTimeSpentPreference.kt
	tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java

Change-Id: I9380bc0e339c8630f7a8d8d8faae01694b2b56d6
parents e998ac3a eeecc835
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment