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

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

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eH5cAJ4tScHLSc13jFQx02ypOW8fQsSPVgCfSOpDJg8wv/sW53jRWo/R9EGutMs=
# =Jj7E
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 2024 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 2473 signatures in the past
#      3 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 Chris Manton (279) and others
# Via Automerger Merge Worker (2288) and others
* tag 'android-15.0.0_r6': (1446 commits)
  Fix OOB writes in gatt_sr.cc
  leaudio: Do not update local metadata if not needed
  Match package prefix instead of complete package name
  Interop fix to not read PPCP for devices that report incompatible values.
  leaudio: Fix data path removal when ACL disconnect event arrives first
  leaudio: Remove reduntant context type copy
  gatt: Fix invalid EATT disconnection
  gatt: Fix function name
  Remove conflict markers from GattService.java
  Use TRANSPORT_LE for unknown device type
  Reducing Gatt_Connect overloads
  Skip ATT Read Blob request for name discovery before MTU exchange
  Add ATT MTU preference for Tesla app
  Send preferred MTU from GattService to native GATT module
  Formatting change in PairingTests.java
  Test case to reconnect after restart
  supports back to back distance measurement
  Use nonwake alarm for RPA rotation
  RfcommTest: Disable profiles
  Add Tests with 2 clients
  ...

 Conflicts:
	system/bta/dm/bta_dm_disc.cc
	system/device/test/interop_test.cc
	system/gd/hci/controller.cc
	system/gd/hci/hci_layer.cc
	system/hci/include/hci_layer.h

Change-Id: Ic10bfd932cc04d84df37b4f2ac474436d00d946f
parents 077e740c 0ec93ed2
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