Commit graph

66306 commits

Author SHA1 Message Date
Xiang Wang
51016462ea Update the vendor API level requirement to 202404
Bug: 302018405
Test: atest VtsHalThermalTargetTest

Change-Id: If3d94374a6096dacc0ed78b0dc933d79adc148d8
2024-06-05 19:21:44 +00:00
Yi Kong
6aad84d933 Merge "Add missing include of <mutex>" into main am: 1612fe7f8e am: efc4698376
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115159

Change-Id: I72e02e6067a2ef15063b83cffea284766c3c1eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 17:24:23 +00:00
Yi Kong
efc4698376 Merge "Add missing include of <mutex>" into main am: 1612fe7f8e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115159

Change-Id: I0cc9717a758177a4e90c2971e58485891ca35a27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 16:46:22 +00:00
Yi Kong
1612fe7f8e Merge "Add missing include of <mutex>" into main 2024-06-05 16:20:38 +00:00
Elliott Hughes
6516ae706f Merge "libc++fs is part of libc++ now." into main am: a22a7ccba5 am: 7754532eae
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3113941

Change-Id: I205ae13d682626179d6720ab967306a5ea1aa107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 13:48:42 +00:00
Elliott Hughes
7754532eae Merge "libc++fs is part of libc++ now." into main am: a22a7ccba5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3113941

Change-Id: I2f9688cd5575051ea5f9e61ebe9b634d8c80f2f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 13:23:46 +00:00
Elliott Hughes
a22a7ccba5 Merge "libc++fs is part of libc++ now." into main 2024-06-05 13:06:47 +00:00
Pechetty Sravani
01868eb8b8 [automerger skipped] Merge "Revert "Remove Vndk_use_version property from AIDL"" into main am: b70524066f -s ours am: 17c61fa34b -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history. Merged-In was found from reverted change.

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115562

Change-Id: Icd46979c197567a89dd7988089972365dfaae0ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 05:49:37 +00:00
Pechetty Sravani
18a011dfb1 [automerger skipped] Revert "Remove Vndk_use_version property from AIDL" am: 6f88ec9cfe -s ours am: ebc4473cae -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history. Merged-In was found from reverted change.

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115562

Change-Id: I982d89271433c1e75ab3bbc69bcb3d5651702771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 05:49:32 +00:00
Pechetty Sravani
17c61fa34b [automerger skipped] Merge "Revert "Remove Vndk_use_version property from AIDL"" into main am: b70524066f -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102643

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115562

Change-Id: I637180721cccc1bfffa96a7aa6a7ca038d1ca224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 05:36:35 +00:00
Pechetty Sravani
ebc4473cae [automerger skipped] Revert "Remove Vndk_use_version property from AIDL" am: 6f88ec9cfe -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102643

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115562

Change-Id: I48e5515130c2582481a3f62279f12b8a73fda5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 05:36:29 +00:00
Pechetty Sravani
b70524066f Merge "Revert "Remove Vndk_use_version property from AIDL"" into main 2024-06-05 05:12:40 +00:00
Treehugger Robot
b0e1fb0443 Merge "Convert system_compatibility_matrix.xml to soong" into main am: bf5b700570 am: 35efb27670
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102739

Change-Id: I50738c47add38524dcb6b97676d4b77fe049383b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 03:44:18 +00:00
Pechetty Sravani
6f88ec9cfe Revert "Remove Vndk_use_version property from AIDL"
Revert submission 3102645-no_vndk_aidl

Reason for revert: Droidmonitor triggered revert due to build breakage in b/345063864. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3102645-no_vndk_aidl

Change-Id: Idc33bb7fbad72d18ac46a69639ac81bf554d469f
2024-06-05 03:42:44 +00:00
Treehugger Robot
35efb27670 Merge "Convert system_compatibility_matrix.xml to soong" into main am: bf5b700570
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102739

Change-Id: Id8eeeacbafc7fa9b74a39eb46705a192ce907dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 03:29:00 +00:00
Treehugger Robot
bf5b700570 Merge "Convert system_compatibility_matrix.xml to soong" into main 2024-06-05 03:10:03 +00:00
Treehugger Robot
2004e001a5 [automerger skipped] Merge "Remove Vndk_use_version property from AIDL" into main am: 1b182103f4 -s ours am: 6e8359dee5 -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102643

Change-Id: Id1be78b14ebbac88868235ba2e38b2e1d358c546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 02:08:32 +00:00
Kiyoung Kim
00f6e1c1af [automerger skipped] Remove Vndk_use_version property from AIDL am: ec3db82cd0 -s ours am: 9f1f9d116d -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102643

Change-Id: I7853a6dd356ac85d3575c63bc3cd5a14268fad3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 02:08:26 +00:00
Treehugger Robot
6e8359dee5 [automerger skipped] Merge "Remove Vndk_use_version property from AIDL" into main am: 1b182103f4 -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102643

Change-Id: Idc8264ad13ba9450905f82db16440e98b5680ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 01:49:53 +00:00
Kiyoung Kim
9f1f9d116d [automerger skipped] Remove Vndk_use_version property from AIDL am: ec3db82cd0 -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102643

Change-Id: I6758a6c83c7df115b0c0f3d661e5a26477288cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 01:49:46 +00:00
Treehugger Robot
1b182103f4 Merge "Remove Vndk_use_version property from AIDL" into main 2024-06-05 01:34:48 +00:00
Pirama Arumuga Nainar
1212902aa2 Add missing include of <mutex>
This fixes build failure with clang-r522817

Bug: 322868540
Change-Id: Ie5db4a32bebd137d1ba11213e0d642d85f1f7d1d
Test: m out/soong/.intermediates/hardware/interfaces/automotive/can/1.0/default/tests/fuzzer/automotiveCanV1.0_fuzzer/android_vendor_arm64_armv8-2a_cortex-a55_fuzzer/e560d7b19ebf7276b3e850d3d346dec8/obj/hardware/interfaces/automotive/can/1.0/default/CanBus.o
2024-06-04 23:10:12 +00:00
Elliott Hughes
98eb91c3cb libc++fs is part of libc++ now.
Change-Id: I55a7c77ec09b21375bd3e3187a12383dde7414b0
2024-06-04 17:25:02 +00:00
David Duarte
dbf9a7e248 Merge "Update to pdl 0.3.0" into main am: cbe01d238c am: ab8f25dbcb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3110377

Change-Id: I5dd994f170b598c480dc566439853b411b7e8a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 00:42:16 +00:00
David Duarte
ab8f25dbcb Merge "Update to pdl 0.3.0" into main am: cbe01d238c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3110377

Change-Id: I2fe4ced53f8791c894300ba3b35a3a2d3211f135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 00:34:17 +00:00
David Duarte
cbe01d238c Merge "Update to pdl 0.3.0" into main 2024-06-04 00:26:19 +00:00
Devin Moore
a4cbd4bb67 [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 500f15a377 -s ours am: 950b7f99d7 -s ours am: 388f7094aa -s ours am: b777839b2a -s ours am: dcfc57fefc -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: Id4dab5b3bec9ee26a36acef8bf4af0b7266f5574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:58:17 +00:00
Devin Moore
34229f9b1f [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 7b29be326a -s ours am: 5fdf26b61d -s ours am: fd0ec9dd9f -s ours am: be4106a829 -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: Ib7879996d255edd91e8d506537e702698786b85f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:58:02 +00:00
Devin Moore
cc9c3d3b33 [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 500f15a377 -s ours am: 950b7f99d7 -s ours am: 388f7094aa -s ours am: 29351660b0 -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I6262d7415acc7d948e15ca7b11f2d69cb0193ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:49:31 +00:00
Devin Moore
dd3838cc98 [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 7b29be326a -s ours am: 5fdf26b61d -s ours am: 808041b3ac -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I8481888548de9b004e31cfd146c8ae9f1bedffe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:49:18 +00:00
Devin Moore
dcfc57fefc [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 500f15a377 -s ours am: 950b7f99d7 -s ours am: 388f7094aa -s ours am: b777839b2a -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: Ifb668a4e6c9efc9be4536e0ebd3b1a9c2e46f0c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:48:55 +00:00
Devin Moore
be4106a829 [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 7b29be326a -s ours am: 5fdf26b61d -s ours am: fd0ec9dd9f -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I8a09a87b4a5c6479fcbdef0cc99cdede6372bbdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:48:44 +00:00
Devin Moore
b777839b2a [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 500f15a377 -s ours am: 950b7f99d7 -s ours am: 388f7094aa -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I64831b2e1e9ffae25d0ad52a60e191e822d9c30c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:42:00 +00:00
Devin Moore
fd0ec9dd9f [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 7b29be326a -s ours am: 5fdf26b61d -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: Ieef697a73b1680c98269edea75a9f8e682ee0998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:41:47 +00:00
Devin Moore
29351660b0 [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 500f15a377 -s ours am: 950b7f99d7 -s ours am: 388f7094aa -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I6fccb38d40fb02701e89ae1070a679e616d0b0d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:41:40 +00:00
Devin Moore
808041b3ac [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 7b29be326a -s ours am: 5fdf26b61d -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I4320695923ee7fc9e5746310535616284091e319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:41:29 +00:00
Devin Moore
388f7094aa [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 500f15a377 -s ours am: 950b7f99d7 -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I053677a668e051ebde51d23ef2b15830a4b4282a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:40:52 +00:00
Devin Moore
5fdf26b61d [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 7b29be326a -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I06e586bdae9d4f4168902575312c96c240736cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:33:11 +00:00
Devin Moore
950b7f99d7 [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours am: 500f15a377 -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I6e8c162fe46c85d32793c72470e6fe8950ef20a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:32:52 +00:00
Devin Moore
7b29be326a [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I0ed87908ebb6d8903240a1b7d079711342938e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:23:34 +00:00
Devin Moore
500f15a377 [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours am: 908888a1cc -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I6a3c55c68a2a7c231b9a74f5cb2e8a1e3a2c2fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:23:33 +00:00
Devin Moore
908888a1cc [automerger skipped] Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19 am: ca11ee87ca -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I85797f383741f9549170d5820814d6c9da25602f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 21:15:49 +00:00
Devin Moore
ca11ee87ca Keep track of DeathMonitor cookies am: 37c395758d am: 30134f8b19
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: I248fd0c78604fbaacbb308233ca4357d403ff254
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 20:58:42 +00:00
Devin Moore
30134f8b19 Keep track of DeathMonitor cookies am: 37c395758d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163475

Change-Id: Ie58f7059cafbbe298c114fe86227249c0a65243f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 20:32:50 +00:00
Treehugger Robot
f6ae053520 [automerger skipped] Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 88ced41d81 am: 823a222711 -s ours am: d0d3b6cae0 -s ours am: 5760e98039 -s ours am: 882c7e7e1c -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476

Change-Id: Iab425cab73b1ba0df6670627254687fe605f5c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 18:38:05 +00:00
Devin Moore
82747df057 [automerger skipped] Use onUnlinked in health HAL am: 1e1627a5da am: f4eac52813 am: f1780bc844 -s ours am: 103bb4b8b4 -s ours am: 13651a1aea -s ours am: 946a5505e6 -s ours
am skip reason: Merged-In Iee4783217cc88134af6de0fe66128684ca984dba with SHA-1 1e1627a5da is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: Ice514b357669bc46cc2dd1a46fdfa6c0b4407cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 18:37:51 +00:00
Treehugger Robot
430b965744 [automerger skipped] Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 3ebbbd99a3 am: fe984ebf99 am: aeb7d0f4ee am: 5970512ccb -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476

Change-Id: Ic2666a9d44ae5dc8c01a8a4466c16dc5cb1a00df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 18:37:37 +00:00
Devin Moore
b0922de1e9 [automerger skipped] Use onUnlinked in health HAL am: 1e1627a5da am: b48ba49001 am: 2d035d5408 am: 82d085a8e2 am: 04a7668333 -s ours
am skip reason: Merged-In Iee4783217cc88134af6de0fe66128684ca984dba with SHA-1 1e1627a5da is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: Iaa6382e195d5cefb52ea6270396edf166ea3e886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 18:37:18 +00:00
Treehugger Robot
3a3119638a [automerger skipped] Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 88ced41d81 am: 823a222711 -s ours am: d0d3b6cae0 -s ours am: 4f5033684e -s ours
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476

Change-Id: I533e1c351653a93c1683b29cd9e914534a490250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 18:12:01 +00:00
Devin Moore
c882ecfc05 [automerger skipped] Use onUnlinked in health HAL am: 1e1627a5da am: f4eac52813 am: f1780bc844 -s ours am: 103bb4b8b4 -s ours am: 18524d6645 -s ours
am skip reason: Merged-In Iee4783217cc88134af6de0fe66128684ca984dba with SHA-1 1e1627a5da is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: If234966be87b1dd6cb68800312eb8d73916e87fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 18:11:46 +00:00