Test: lunch aosp_cf_x86_64_only_phone-next-userdebug
Test: VtsHalWifiSupplicantStaNetworkTargetTest
Bug: 328328863
(cherry picked from https://android-review.googlesource.com/q/commit:eb653ee3aeaebc02c3439655673b135d397ecdec)
Merged-In: I4bc27098f09213564e4ec39036783b1a853a11b3
Change-Id: I4bc27098f09213564e4ec39036783b1a853a11b3

When SF fps doesn't match vsync rate (either due to vrr or frame rate
override), the frame interval calculation in Scheduler should take this
into account.

Bug: 328352850
Test: atest CtsSurfaceControlTests
Test: atest libsurfaceflinger_unittest
Test: atest FrameRateOverrideTest
Change-Id: I3261c7f2245fcb64c3e79bb3dcb21f1b0e44a395
(cherry picked from commit af854add)
Merged-In: I3261c7f2245fcb64c3e79bb3dcb21f1b0e44a395

Since there is already precedent for InputReader to interact with the
policy with its lock held, we must not do the same from other
components, since it can result in deadlocks.

In this CL, we ensure that the PointerChoreographer does not interact
with the policy while holding its lock. The exception is the use of the
factory method for PointerController, which is only part of the policy
to work around dependency issues with graphics libraries.

Bug: 327717240
Test: atest inputflinger_tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5a51a2280743605a51e2f9d632077e9297276520)
Merged-In: Ib81d72898a212275d95f9d84d89a16e7172e108e
Change-Id: Ib81d72898a212275d95f9d84d89a16e7172e108e

In the following CL, we made a change that results in the mouse cursor
position being valid whenever there is a mouse or touchpad connected:
I55898a3de1beb0f83f5da199521f26a886fb596c

This means we are no longer depending on creating mouse controllers
on-the-fly based on the input events. Remove the logic that creates
mouse controllers on-the-fly.

Bug: 327717240
Test: atest inputflinger_tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:990d8713a9913136dba9eb57f3b351edaa00be26)
Merged-In: I0fa10ef48055d80136083a1c0ab23522f6683fdc
Change-Id: I0fa10ef48055d80136083a1c0ab23522f6683fdc

This reverts commit b6c7f880.

Reason for revert: Regressions tracked as childs on b/326599221

Change-Id: Ic0f959113a2d434d3b6412c90b58b85e5151e436
Merged-In: Ic0f959113a2d434d3b6412c90b58b85e5151e436
(cherry picked from commit 9633f8e8)

[automerger skipped] Merge "Fix "Abnormal while playing netflix in PIP mode"" into main am: 3aa13d0d -s ours am: 7c46c7a7 -s ours

am skip reason: Merged-In I11d7c73c8eee4a46383516e8eb672827b26314e6 with SHA-1 7303877b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2804753



Change-Id: I48382c8940ec562399ae64517b87733a2c185b8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Fix "Abnormal while playing netflix in PIP mode" am: 48d09516 -s ours am: 5df8fa9a -s ours

am skip reason: Merged-In I11d7c73c8eee4a46383516e8eb672827b26314e6 with SHA-1 7303877b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2804753



Change-Id: I64daa19181b6bb90035b88328de6b7efaf091a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Fix "Abnormal while playing netflix in PIP mode"" into main am: 3aa13d0d -s ours

am skip reason: Merged-In I11d7c73c8eee4a46383516e8eb672827b26314e6 with SHA-1 7303877b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2804753



Change-Id: I5686c684ef835939a93bcf8a196c23f532a6c6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In I11d7c73c8eee4a46383516e8eb672827b26314e6 with SHA-1 7303877b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2804753



Change-Id: Ia337d42577a539bc04654b0725dfb9275381c851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Fix BatteryService enum inconsistent with BatteryManager" into main am: 5905aa30 am: 19f0b98a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2982984



Change-Id: I541962bc2783734d9848263683c0bb5ac809c62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2982984



Change-Id: I85e98370a76786bc11e58b87b66dfa15bbe5df89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This reverts commit b43b5837.

Reason for revert: Appstartup regression found in b/327488235

Change-Id: I8d975b81afd2cde1d543e8bc7e730a6e42393bec

Bug: 327686151
Test: m
Change-Id: Ie32a094380a62ba56689b4ea008168a6d9c2a820
Signed-off-by: Jack Wu <wjack@google.com>

protected buffer usage of output buffer of framebuffer is determined
by if any input layer contains protected buffer.

If all the protected layers are handled by HWC,then GPU will process
normal layers only. It means, GPU got normal buffer as input but need
output to protected buffer.It would be memory violation for ARM as it
required at least one normal buffer as input for such case

Bug: 307674749
Test: atest
    libcompositionengine_test:OutputUpdateProtectedContentStateTest

Change-Id: I11d7c73c8eee4a46383516e8eb672827b26314e6
Merged-In: I11d7c73c8eee4a46383516e8eb672827b26314e6

[automerger skipped] Merge "Add missing libc++ includes" into aosp-main-future am: a7b5bdd3 -s ours

am skip reason: Merged-In I9cef8d1b0306fab363e2fe4eda39782e21f24d8f with SHA-1 94a21e9a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/26403108



Change-Id: I93e26e88f907f10fc97d3a199af5de4abaebf01f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In I9cef8d1b0306fab363e2fe4eda39782e21f24d8f with SHA-1 94a21e9a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/26403108



Change-Id: I6452b82633aab8d6994517c217ffe7e2c8d994b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

- Freeze the old flag file
- Create a new file, alphabetize and annotate
  brackets to reduce merge conflicts

Test: presubmit
Change-Id: I6b6a1c81dea39f22eca5dc671e0cfedc7d139b25

When we slide an event into a new window, we should check if the window
 can receive motion events to prevent incorrect dispatching of events.

Bug: None
Test: atest inputflinger_tests

Signed-off-by: Linnan Li <lilinnan@xiaomi.corp-partner.google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:76f89b7a1bac7a3be2fc8f5b990e39a45a265afa)
Merged-In: Idc604c4db40f77ee682b88060b9e9d3f33c594aa
Change-Id: Idc604c4db40f77ee682b88060b9e9d3f33c594aa

Merge "Set linker namespaces to null if VNDK namespace is not available" into main am: f3166e46 am: a981bd54

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2918496



Change-Id: I1dd108d427e0e0259c16ebcb364c73947a5b2cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2918496



Change-Id: I0f787e3693f81b33f676dbad24006a2943559f30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Fix HighHint touch boost regarding frame rate override. The
touch boost logic in getFrameRateOverrides should mirror frame rate
selection in getRankedFrameRates. We decided earlier that HighHint is
only ignored when there are ExplicitDefault compatibility votes.

Bug: 326666127
Test: atest libsurfaceflinger_unittest
Test: jank test cases + manual
Change-Id: I54ac61f2a174b9a4dea7d67d8b196217b4f60921

Merge "atrace: allow tracefs/buffer_percent RW use + remove dead code" into main am: 0829ecec am: 910618a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2975539



Change-Id: I826a6624f63dfaf6948f5f6cdc9fb005900386d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 175635923
Test: m checkbuild
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:94a21e9ae2ea8162128fe392f743d523238b7f3e)
Merged-In: I9cef8d1b0306fab363e2fe4eda39782e21f24d8f
Change-Id: I9cef8d1b0306fab363e2fe4eda39782e21f24d8f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2975539



Change-Id: I77cdeed1990e9e090b0cf9077a0852f6bfb1c25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

As AInputEvent_toJava makes JNI calls, the caller must ensure there are
no pending JNI exceptions as it may result in undefined behaviour. This
needs to be explicitly documented.
Refer: https://developer.android.com/training/articles/perf-jni#exceptions

Bug: 324375527
Test: atest MotionEventTest KeyEventTest
Change-Id: If9f40ba1ee2cb091514fb3baae28f2ca7520727e