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

Skip to content
Unverified Commit 6f86e34c 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+BmrEOeAUCZmdzpQAKCRDorT+BmrEO
# eN9RAJ4npqXsNYcX3LDjWQalAVrMdMXqHwCeIqcFl6c3atUw6CSxVwouztUVQyE=
# =d7if
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:05 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 2483 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 Prabir Pradhan (49) and others
# Via Android (Google) Code Review (259) and others
* tag 'android-14.0.0_r50': (394 commits)
  InputDevice: switch Sony DualShock 4 to new touchpad stack
  PointerChoreographer: Add drawing tablet support
  Add APersistableBundle to lldnk
  Revert "SF: Introduce VsyncTimeline to VsyncPredictor"
  PointerChoreographer: Do not call the policy with the lock held
  PointerChoreographer: Remove ability to create mouse controllers OTF
  Revert "Refactor of screenshot code on main thread."
  Fix BatteryService enum inconsistent with BatteryManager
  Fix "Abnormal while playing netflix in PIP mode"
  Reorganize surfaceflinger_flags aconfig
  Do not slide event into the new window which can't receive motion event
  HighHint touch boost fix re. frame rate override
  Add missing libc++ includes
  Update documentation for AInputEvent_toJava
  SF: Introduce VsyncTimeline to VsyncPredictor
  Fix dont_skip_on_early_ro to be read only again
  Read pointer choreographer flag at boot
  Send wake event to ISensorHalWrapper fmq when switching to Hal Bypass Mode
  [SF] Add trace and dump for Game frame rate overrides
  Disable SkiaVK support on CPU implementations
  ...

 Conflicts:
	libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h
	services/inputflinger/dispatcher/InputDispatcher.cpp
	services/inputflinger/reader/mapper/MultiTouchInputMapper.cpp
	services/inputflinger/reader/mapper/accumulator/MultiTouchMotionAccumulator.cpp
	services/inputflinger/tests/InputReader_test.cpp

Change-Id: I6eb484c778a448d913c3070326d84e1cb71c6b2a
parents 238a5b52 8b1d65e8
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