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

Skip to content
Unverified Commit 8cb58819 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
# eO34AJsF1JYIvRcL/14zZMuGrzi8T/Mp2QCeMOtslTujgfrxFEe8CsDqbNg/4Qw=
# =+UN/
# -----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 2468 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 Vishnu Nair (38) and others
# Via Automerger Merge Worker (389) and others
* tag 'android-15.0.0_r6': (530 commits)
  Error fix from enabling Clang thread-safety checks in Cuttlefish
  Add a flag header file with dependencies.
  Revert "Add some tracing for release fences"
  Remove gaillard@ from debugstore OWNERS
  [legacy layer cleanup] Misc dead code in Layer
  [legacy layer cleanup] Transaction methods
  [legacy layer cleanup] Crop and transform methods
  Move key remapping to InputReader thread(1/n)
  Disable Clang thread-safety checks in surfaceflinger unit tests
  DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR
  Update InputConsumer_test.cpp to use getFdStateDebug
  Add current device consumption to InputConsumerNoResampling
  Add more cachable service to libbinder cache
  Fix the input info missing for SurfaceView
  DO_NOT_MERGE Fix primaryRangeIsSingleRate + touch on dVRR
  Read from aflags in dumpstate
  Remove unused include.
  Remove __INTRODUCED_IN_LLNDK uses.
  Add missing IProducerListener callbacks to BLASTBufferQueue
  Fix batching logic in InputConsumerNoResampling.cpp
  ...

 Conflicts:
	opengl/libs/EGL/egl_platform_entries.cpp
	services/inputflinger/include/InputReaderBase.h
	services/surfaceflinger/Android.bp
	services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
	services/surfaceflinger/SurfaceFlinger.h

Change-Id: I0e38b00526d430397f5b00531f36befffb89ef02
parents c6fd3027 7c3bec84
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