am skip reason: Merged-In I3977722564241817575d94b2d2023eac6939ce1c with SHA-1 f42925e978 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/30284975
Change-Id: Icd021cbd1b5384ff22e2913d053fb96006fbd4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZyveQgAKCRDorT+BmrEO
eJM2AJ9qMKzVt1NzhtprBRWqM3A11xgkyACfcOmtzhEb5maHBfy6HN4RrZV298A=
=A3nx
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmcsubQXHG1rYmVzdGFz
QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+Zmk/sxAAgdP8KbCebfzeqHemQy8vJKVf
apTs2X4OPLWpgnqULTahzN6ZdvHWhaakxUPF1MIxhLl7RBdeGnSndjxLx/B5sr/G
ahT5WzOpjGPy9YBMxenPNxmSCjf5drLtwbsOCxRi4GXIGcdEiOll2G9yKXP7eRrs
KDGFhtrr7UaoNISyDsmvmBQfQKuwyY+DEpD74Qd1B8gE1+IA+4JOiNEUiZV3rm9G
u1J4PwOFdukBebb82lKX03zImm8kRNfn7txAvwjE3mIEN3AKBMrkv3CZoa3JgDgP
RUGjXC9A/4FUt23G0r+lFxXFTaBD+HszhMBhZ5BsMM3xJWuW6rUOwzTKFYtWJTVX
L/6T4L8OU0sWG0f0OvSBk+pHjl+Yg3haPBaA9+lVVAHtX7enYTgZTaKkfQkX7f93
3jeH0DTUhxvq9W9mQ9S9z6Z3vsGh+YMZXq07hAs1Tf5lgLfRZAqRq3qdC/wEtBNK
kXGtqSPphMO+AS2b9j0cbKFSz3YqVe2wurcm8oXpl/YMWyN4zFZi+1wPgMW5oeVL
i5LvVHb0SCstVWMncDg0S7hV1rxqGpi7hDslmDxUranvb3vTMQwMWr0BTv5p9Lbo
rLkEyD4zbtB9wfIf7xg4b/NUQfloW+p+8NaqDejqbHff+3NiThiopn2xBzql01Fx
JySBI/GrXmbkBmMivd8=
=4XHq
-----END PGP SIGNATURE-----
Merge tag 'android-15.0.0_r4' into staging/lineage-22.0_merge-android-15.0.0_r4
Android 15.0.0 release 4
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZyveQgAKCRDorT+BmrEO
# eJM2AJ9qMKzVt1NzhtprBRWqM3A11xgkyACfcOmtzhEb5maHBfy6HN4RrZV298A=
# =A3nx
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Nov 6 23:23:14 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 2340 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 gilliu
# Via Android Build Coastguard Worker
* tag 'android-15.0.0_r4':
add hal_graphics_composer to access thermal temperature
Change-Id: I7d332857715494aa6a38a96ed26258d2853fb44a
Corrected order of Assert Equals, and moved awk parsing into the
java code. executeShellV2Command does not handle single quoted awk
strings well.
Flag: TEST_ONLY
Bug: 376164007
Test: atest CopyEfsTest
Change-Id: Idea19467ec2f08b1365a2389a1dd3b1db8d429e4
Revert submission 30066446-goodix-ext-service-aidl
Reason for revert: Droidmonitor created revert due to b/376465180. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:30066446-goodix-ext-service-aidl
Change-Id: I25cf72f9acbfcce57182aeb8f95a5711af9899b4
Set the full module path of libacryl_hdr_plugin and the include dir for
lobacryl conversion to soong. It will take effect after aosp/3286932 and
aosp/3287183 merged.
Bug: 370414334
Test: lunch aosp_shiba-trunk_staging-userdebug ; m libacryl_hdr_plugin libacryl
Change-Id: I253ce1254450385e83ecaa75acbee5e70df3a930
MTE is a low overhead tool which enables detection of memory
safety bugs in interactive workloads. See
https://source.android.com/docs/security/test/memory-safety/arm-mte
for background and information.
This change enables MTE by default on -eng builds on zuma
builds.
Co-authored-by: Evgenii Stepanov <eugenis@google.com>
Test: Device boots and no MTE crashes
Test: sanitizer-status mte
Bug: 316398899
Change-Id: Iff5ab9d7031d8b97bf762d85f6760a092631e121
Set the full module path of libacryl_hdr_plugin and the include dir for
lobacryl conversion to soong. It will take effect after aosp/3286932 and
aosp/3287183 merged.
Bug: 370414334
Test: lunch aosp_shiba-trunk_staging-userdebug ; m libacryl_hdr_plugin libacryl
Change-Id: I253ce1254450385e83ecaa75acbee5e70df3a930
am skip reason: Merged-In I2f6c1f3365f624502366b883dbcd1066ed166cdb with SHA-1 8cd5a64cd7 is already in history
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3313596
Change-Id: I1b21593ad06460ec23201fe6a8a782061649294c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ibd060eae8f4e97ae8ff800f765e2310c984e5796 with SHA-1 354b984c0d is already in history
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3313595
Change-Id: Ic0b905682b77dbd0eafe3bb2d15b21e0e6a74752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I1e0bea52de09fe3c9ee2f52b0803882456943833 with SHA-1 bf9f082f67 is already in history
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3312654
Change-Id: I57cdaca2cfcf165bc19e4cca72b37567f6b63039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
