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

Skip to content
Unverified Commit 5b8c849d 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+BmrEOeAUCZ6D3AgAKCRDorT+BmrEO
# eORdAJ9ghucA79q2bzp/ZV/2VVKawrHEZwCcDDQ/tgJUqsOwUunH0jGkvTpePXw=
# =6wM4
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Feb  3 19:04:02 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Brian Delwiche (2) and Billy Huang (1)
# Via Android Build Coastguard Worker
* tag 'android-security-14.0.0_r17':
  Reset permissions for not bonded device
  RESTRICT AUTOMERGE backport "opp: validate that content uri belongs to current user"
  Resolve incomplete fix for SMP authentication bypass

 Conflicts:
	android/app/src/com/android/bluetooth/btservice/BondStateMachine.java
	android/app/src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
	system/stack/smp/smp_act.cc

Change-Id: Id2370896670d040cc03704d8e080f766f9be8e3f
parents eaafcbe8 cf167f63
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