[automerger skipped] Merge "Use String8/16 c_str [graphics]" into main am: 382d1f84 am: cc4c5403 -s ours am: 51ffa553 -s ours am: 5f0c4171 -s ours am: a4635097 -s ours

am skip reason: Merged-In I69aa06b109c2f40ecf40441cbbb0dfa3e1aa99a1 with SHA-1 f2add40f is already in history

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



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

[automerger skipped] Merge "Use String8/16 c_str [graphics]" into main am: 382d1f84 am: cc4c5403 -s ours am: 51ffa553 -s ours am: 5f0c4171 -s ours

am skip reason: Merged-In I69aa06b109c2f40ecf40441cbbb0dfa3e1aa99a1 with SHA-1 f2add40f is already in history

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



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

[automerger skipped] Merge "Use String8/16 c_str [graphics]" into main am: 382d1f84 am: cc4c5403 -s ours am: 51ffa553 -s ours

am skip reason: Merged-In I69aa06b109c2f40ecf40441cbbb0dfa3e1aa99a1 with SHA-1 f2add40f is already in history

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



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

[automerger skipped] Merge "Use String8/16 c_str [graphics]" into main am: 382d1f84 am: cc4c5403 -s ours

am skip reason: Merged-In I69aa06b109c2f40ecf40441cbbb0dfa3e1aa99a1 with SHA-1 f2add40f is already in history

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



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

[automerger skipped] Merge "Revert "Generate texture pool asynchronously"" into udc-qpr-dev am: 19603058 am: a77ef203 -s ours

am skip reason: Merged-In Icb92a85c07b9f2911d1365aa9bbc8d0750a8c116 with SHA-1 bfcc6102 is already in history. Merged-In was found from reverted change.

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

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



Change-Id: I877f4a9044e9d4d63ad8b08b5326e04b49b45406
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/+/2715993



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

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



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

Merge "Use llndk.libraries.txt from system if VNDK is deprecated" into main am: b2d6cc2e am: 95c85d27 am: a8e994b0 am: c5414a7c am: 423deec6

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



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

[automerger skipped] Merge "Use String8/16 c_str [graphics]" into udc-dev-plus-aosp am: 1bcbf26f am: cdbed993 am: be8ef46e -s ours

am skip reason: Merged-In I69aa06b109c2f40ecf40441cbbb0dfa3e1aa99a1 with SHA-1 b19fe0c9 is already in history

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



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

Merge "Use llndk.libraries.txt from system if VNDK is deprecated" into main am: b2d6cc2e am: 95c85d27 am: a8e994b0 am: c5414a7c

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



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

Merge "Use llndk.libraries.txt from system if VNDK is deprecated" into main am: b2d6cc2e am: 95c85d27 am: a8e994b0

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



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

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



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

Merge "Use llndk.libraries.txt from system if VNDK is deprecated" into main am: b2d6cc2e am: 95c85d27

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



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

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



Change-Id: Iaa006d3afad8f2b0c4c238bea574e09ef5f8650b
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/+/2703694



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

The original intent was to avoid using GLESRenderEngine, since MSKP
capture cannot be used with that backend. Moreover, now we have
skiavkthreaded, and we should be able to capture in that mode as well.

Noticed while investigating b/296282988, though this is not directly
related.

Bug: 296282988
Change-Id: I5ab4a180a3649bfc536dcee82e6a699f165a3555

GLESRenderEngine used it, but GLESRenderEngine is no more.

Bug: 199918329
Test: builds
Change-Id: Id4fcc15d802523faa548ccea0bbd94cffea1b272

This will soon be denied by default, but we trust that what cxx does is
correct. Also added a missing safety comment.

Bug: 290018030
Test: m rust
Change-Id: I55e3cad8cdfcd2053d01adfb7eb1e60858b813fd

[automerger skipped] Merge "Allow unsafe operations in unsafe functions in generated code." into udc-qpr-dev am: 644f53dd am: 937806e6 -s ours

am skip reason: Merged-In If38e434a5d9e3320cfa7e6f686a078f7ee764435 with SHA-1 37994229 is already in history

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



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

Merge "Allow unsafe operations in unsafe functions in generated code." into udc-qpr-dev am: 644f53dd

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



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

Merge "Adding defaults for AIDL rust fuzzers" into main am: c3ad2e35 am: c35ea4ec am: c7d2de75 am: d08df422 am: 48f8fb4d

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



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

Track & dump the HDRLayerInfo callback history to
aid debugging when HDR brightness changes aren't
happening

Bug: 234181960
Test: adb shell dumpsys surfaceflinger --hdrinfo
Change-Id: Ia8376517877d4c7844af6be4d488299554c164f5

Merge "Adding defaults for AIDL rust fuzzers" into main am: c3ad2e35 am: c35ea4ec am: c7d2de75 am: d08df422

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



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

Merge "Adding defaults for AIDL rust fuzzers" into main am: c3ad2e35 am: c35ea4ec am: c7d2de75

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



Change-Id: If0c2474759999c17e49badef7b5ed908010fe3f9
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/+/2713744



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

[automerger skipped] Merge "SF: use frame rate override even when the physical range is single" into udc-qpr-dev am: b91b5e57 am: 87457a38 -s ours

am skip reason: Merged-In I4d6d6ddffd6004022d02329148709204ff9d57db with SHA-1 90f7fd29 is already in history

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



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

Bug: 261485283
Test: HdrRenderTypeUtils_test
Change-Id: I094836e460e0d64b28492061128cff11f22944d9