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

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

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

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzpwAKCRDorT+BmrEO
# eDhOAJ4zdfbYz3FcUQbcNnI6D9a20URr2gCfcKWHfu7tetB3jh3u0P1/iPwoiQ0=
# =DOYz
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:07 2024 EEST
# 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 2512 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# 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 Myles Watson (108) and others
# Via Automerger Merge Worker (1673) and others
* tag 'android-14.0.0_r50': (917 commits)
  Revert "Fix an authentication bypass bug in SMP"
  Import translations. DO NOT MERGE ANYWHERE
  leaudio: Fix crash on metadata update
  api: GetConnectionState OR state of identity address
  system/btif: Migrate to libbluetooth_log
  system/btif/src: Migrate to libbluetooth_log
  api: GetConnectionState OR state of resolved address
  Add load_did_config_from_sysprops flag
  system/log: Add protection against nullptr string parameters
  Move active_peer and codec config to a separate state.
  Clear calling identity when calling getConnectionState internally
  Update the imports to androidx.test.filters.*
  Comment out select unused parameters test::mock::bta::
  Comment out unused parameters bta_dm_disc_stop_service_discovery
  Remove libosi dependency from l2cap-fuzzer
  Use a single mock LE Advertising Manager
  bass_client: Inform sinks about start/stop scanning
  le_audio: Handle overlapping connected LE Audio devices
  HalVersionManager: make instance_ptr after static versions init
  Remove audio_hal_version_class flag
  ...

 Conflicts:
	system/gd/hci/controller.cc
	system/hci/include/hci_layer.h
	system/stack/btm/btm_ble_gap.cc
	system/stack/btm/btm_sec.cc
	system/stack/l2cap/l2c_utils.cc

Change-Id: Ifc614879dd258594bc42e8f5df7aca5f3b9c7d56
parents 8de6650c 8786b78c
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