Commit Graph

61023 Commits

Author SHA1 Message Date
Treehugger Robot
2d67b6d140 Merge "Don't depend on String8 cast to C string [health]" into main am: d937584b22 am: 69f5242fba am: bd44ec07a2 am: 4d79351da6 am: e23e5c94bb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748301

Change-Id: Id918272405a3ceb1f10574c401cb1c60dbbe3a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 23:26:00 +00:00
Treehugger Robot
e23e5c94bb Merge "Don't depend on String8 cast to C string [health]" into main am: d937584b22 am: 69f5242fba am: bd44ec07a2 am: 4d79351da6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748301

Change-Id: I367c9d6940716e1b84af359f411a26d967b8f74a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 22:19:42 +00:00
Treehugger Robot
4d79351da6 Merge "Don't depend on String8 cast to C string [health]" into main am: d937584b22 am: 69f5242fba am: bd44ec07a2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748301

Change-Id: Ieb96a77a258776ac48de153b8cecbf19497ddab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 21:35:51 +00:00
Treehugger Robot
bd44ec07a2 Merge "Don't depend on String8 cast to C string [health]" into main am: d937584b22 am: 69f5242fba
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748301

Change-Id: I92630f1488fdf7a23ca6d286432eec854f9c792b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 20:41:43 +00:00
Andrew Walbran
c643a062fa Merge "Enable Rust build of android.hardware.media.bufferpool2." into aosp-main-future am: ddd2d2457f am: 33344f4236 am: 095c32d0ed am: 9c02d068d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24760773

Change-Id: Icf77ea235f5f9a45ce167b13b6afc1526911d09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 20:39:43 +00:00
Treehugger Robot
69f5242fba Merge "Don't depend on String8 cast to C string [health]" into main am: d937584b22
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748301

Change-Id: I1c913e1f157c5270904b2d92d729b85977b5189d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 19:15:18 +00:00
Andrew Walbran
9c02d068d4 Merge "Enable Rust build of android.hardware.media.bufferpool2." into aosp-main-future am: ddd2d2457f am: 33344f4236 am: 095c32d0ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24760773

Change-Id: Ib4106c243168a198caf3b509d7e3276a14d39df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 19:05:46 +00:00
Andrew Walbran
095c32d0ed Merge "Enable Rust build of android.hardware.media.bufferpool2." into aosp-main-future am: ddd2d2457f am: 33344f4236
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24760773

Change-Id: If7f79943826994a8095b75a9cf083aa01f7cc426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 18:23:58 +00:00
Treehugger Robot
d937584b22 Merge "Don't depend on String8 cast to C string [health]" into main 2023-09-26 18:00:21 +00:00
Andrew Walbran
33344f4236 Merge "Enable Rust build of android.hardware.media.bufferpool2." into aosp-main-future am: ddd2d2457f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24760773

Change-Id: I5a3dca6d140fb77e684c2175695471ecc037c46c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 17:00:42 +00:00
Andrew Walbran
ddd2d2457f Merge "Enable Rust build of android.hardware.media.bufferpool2." into aosp-main-future 2023-09-26 16:39:05 +00:00
Gabriel Biren
f356c8b654 Merge "Disable Wi-Fi framework during VTS" into main am: bddf425784 am: 93ce27b837 am: 369df82b89 am: 36b3a962ab am: 0fc404280f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2728874

Change-Id: I9144f5ba40d51064c5bf4491171b3708f4c87141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 03:17:34 +00:00
Gabriel Biren
0fc404280f Merge "Disable Wi-Fi framework during VTS" into main am: bddf425784 am: 93ce27b837 am: 369df82b89 am: 36b3a962ab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2728874

Change-Id: I65c0ce4ff152b3e65a1ef6003358a36ba817e514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 02:12:26 +00:00
Gabriel Biren
36b3a962ab Merge "Disable Wi-Fi framework during VTS" into main am: bddf425784 am: 93ce27b837 am: 369df82b89
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2728874

Change-Id: If215aeee6e0d5637b436c43ce79aa0218db34b28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 01:31:37 +00:00
Gabriel Biren
369df82b89 Merge "Disable Wi-Fi framework during VTS" into main am: bddf425784 am: 93ce27b837
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2728874

Change-Id: Idad98c56ad219fd26f7e26e4b1c66df90d35646c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 00:37:32 +00:00
Treehugger Robot
0936f08177 Merge "Skip known VTS failures on vendor code till U" into main am: 87e6b60eb3 am: 3877b6094b am: fffa8ca6e1 am: f50374b25d am: d1f2fa4118
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654142

Change-Id: Id40b9c60258bb5b19d68f835ec251c6d1fbff600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 23:48:18 +00:00
Gabriel Biren
93ce27b837 Merge "Disable Wi-Fi framework during VTS" into main am: bddf425784
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2728874

Change-Id: Idf7f13190d2e731afa4633b7bc31437ae2ed0ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 23:41:06 +00:00
Treehugger Robot
d1f2fa4118 Merge "Skip known VTS failures on vendor code till U" into main am: 87e6b60eb3 am: 3877b6094b am: fffa8ca6e1 am: f50374b25d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654142

Change-Id: I63ae030c500b388dec87d3c0cf94d2b5d6c40136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 22:40:23 +00:00
Gabriel Biren
bddf425784 Merge "Disable Wi-Fi framework during VTS" into main 2023-09-25 22:34:44 +00:00
Treehugger Robot
f50374b25d Merge "Skip known VTS failures on vendor code till U" into main am: 87e6b60eb3 am: 3877b6094b am: fffa8ca6e1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654142

Change-Id: I09d4368033dedaa859784db27c812d10c5a72b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 21:59:13 +00:00
Hao Chen
b5edda79f5 Merge "Use EvsCamera as the base of EvsMockCamera" into main 2023-09-25 21:56:58 +00:00
Mikhail Naganov
ccf96925f7 Merge "audio: Fix connection between alsa_device_profile and _proxy" into main am: f69e0b6795 am: 4991074eba am: e6e1a30685 am: e1c3c4f221 am: 5aaaaccb27
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2760046

Change-Id: Ibd23624ba8c743004815ba43cd9e1bc1488f808a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 21:04:11 +00:00
Treehugger Robot
fffa8ca6e1 Merge "Skip known VTS failures on vendor code till U" into main am: 87e6b60eb3 am: 3877b6094b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654142

Change-Id: I86c851d6a433a60e08e4141f895d22f3b2c768d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 20:56:41 +00:00
Rucha Katakwar
886f73907f Merge "Camera: Flash strength control during camera use." into main 2023-09-25 20:45:06 +00:00
Hao Chen
e04a700d86 Use EvsCamera as the base of EvsMockCamera
Test: Build and run (mock) evs_app tests
Bug: 300533205
Change-Id: I8e43c5879dee9942c27d69cdfb3012d35b123441
2023-09-25 20:32:10 +00:00
Treehugger Robot
3877b6094b Merge "Skip known VTS failures on vendor code till U" into main am: 87e6b60eb3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654142

Change-Id: If63ff188c3e82b4648706b910ee02e729409cdc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 19:58:54 +00:00
Mikhail Naganov
5aaaaccb27 Merge "audio: Fix connection between alsa_device_profile and _proxy" into main am: f69e0b6795 am: 4991074eba am: e6e1a30685 am: e1c3c4f221
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2760046

Change-Id: I6a1f3b21a3cd2530a3f61b9fab34adc16eff31d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 19:50:33 +00:00
Treehugger Robot
87e6b60eb3 Merge "Skip known VTS failures on vendor code till U" into main 2023-09-25 19:24:14 +00:00
Mikhail Naganov
e1c3c4f221 Merge "audio: Fix connection between alsa_device_profile and _proxy" into main am: f69e0b6795 am: 4991074eba am: e6e1a30685
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2760046

Change-Id: I0ca1564109cf30dce3bed2c01b389288e8120ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 19:08:49 +00:00
Tom Bergan
59414af068 Merge "Fix crash in SthalCli" into main 2023-09-25 18:32:02 +00:00
Mikhail Naganov
e6e1a30685 Merge "audio: Fix connection between alsa_device_profile and _proxy" into main am: f69e0b6795 am: 4991074eba
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2760046

Change-Id: If5dd74047973428e18cc83d51ab4eae5baca9a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 18:13:49 +00:00
Hao Chen
7fe8c25fc0 Merge "Add EVS Video Emulated Camera Class" into main 2023-09-25 17:53:17 +00:00
Mikhail Naganov
4991074eba Merge "audio: Fix connection between alsa_device_profile and _proxy" into main am: f69e0b6795
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2760046

Change-Id: I1203693e0bd17f89326b99b7ff60c4fea75809d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 17:11:27 +00:00
Mikhail Naganov
f69e0b6795 Merge "audio: Fix connection between alsa_device_profile and _proxy" into main 2023-09-25 16:00:00 +00:00
Treehugger Robot
761194a4de Merge "Updated vehicleManager_fuzzer" into main am: 7761d90af1 am: 6569dc7511 am: 535ac9f544 am: ae164210c6 am: 16eca29bce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2097954

Change-Id: Ie303bd8e1c696af381034833a2f7251a6f3b1ca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 08:13:17 +00:00
Treehugger Robot
16eca29bce Merge "Updated vehicleManager_fuzzer" into main am: 7761d90af1 am: 6569dc7511 am: 535ac9f544 am: ae164210c6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2097954

Change-Id: I5c4ff6f1cbb4184c1fa8997fa5db9bfdd82ced38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 07:08:39 +00:00
Treehugger Robot
ae164210c6 Merge "Updated vehicleManager_fuzzer" into main am: 7761d90af1 am: 6569dc7511 am: 535ac9f544
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2097954

Change-Id: Ib634fb8cf89346d2bcef312888e993771f3dce92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 06:27:04 +00:00
Treehugger Robot
535ac9f544 Merge "Updated vehicleManager_fuzzer" into main am: 7761d90af1 am: 6569dc7511
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2097954

Change-Id: I91829b13ef77fdf8ef43969f8a88891eaf2d66c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 05:34:19 +00:00
Treehugger Robot
6569dc7511 Merge "Updated vehicleManager_fuzzer" into main am: 7761d90af1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2097954

Change-Id: Ic84b53a9c26e671cec114c7fb82a8a23600ea619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 04:34:27 +00:00
Treehugger Robot
7761d90af1 Merge "Updated vehicleManager_fuzzer" into main 2023-09-25 03:21:12 +00:00
Treehugger Robot
2b1b325a06 Merge changes from topic "sdv-vhal-emulator-service" into udc-qpr-dev-plus-aosp am: dfa4ae0d28
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24805466

Change-Id: I32b745bb733b52d6fd77c17fd584da5a6c073575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 23:18:53 +00:00
Aaqib Ismail
b795b1d1f8 Move VHAL config dirs to protected am: 7d483bc656
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24763109

Change-Id: Iab730128e61e96628c710a9015d298fc07359c47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 23:18:50 +00:00
Aaqib Ismail
ba0124af54 Make 2.0-libproto-native visible to sdv_ivi_cf am: b5310066d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24725582

Change-Id: Ie19139f92ade10a84f824921e9f5f0fb88a5c66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 23:18:45 +00:00
Treehugger Robot
dfa4ae0d28 Merge changes from topic "sdv-vhal-emulator-service" into udc-qpr-dev-plus-aosp
* changes:
  Make event callback accessible to child classes
  Move VHAL config dirs to protected
  Make 2.0-libproto-native visible to sdv_ivi_cf
2023-09-23 22:56:05 +00:00
Shunkai Yao
bd3882ea1f [automerger skipped] Merge "audio: Fix Effect worker thread" into udc-qpr-dev am: 38b3a2b393 -s ours am: 18bf375d20 -s ours
am skip reason: Merged-In If54c8fa62827e5f28e620dd841d638028149b1b8 with SHA-1 632b1cd048 is already in history

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

Change-Id: I3c7d3f5a8f5b5c68ebf60b7057f22a4abeee58ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 02:16:27 +00:00
Jaideep Sharma
61f8d1bd8e [automerger skipped] audio: Fix Effect worker thread am: 08fe547a3a -s ours am: 22c84aaab1 -s ours
am skip reason: Merged-In If54c8fa62827e5f28e620dd841d638028149b1b8 with SHA-1 632b1cd048 is already in history

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

Change-Id: Icb6a2eb601bb4fe4db5ef76f0f875e93f33302dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 02:16:23 +00:00
Shunkai Yao
18bf375d20 [automerger skipped] Merge "audio: Fix Effect worker thread" into udc-qpr-dev am: 38b3a2b393 -s ours
am skip reason: Merged-In If54c8fa62827e5f28e620dd841d638028149b1b8 with SHA-1 632b1cd048 is already in history

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

Change-Id: I656261e9ed3d6725bd1e2f0ae09f42aa27993faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 01:19:48 +00:00
Jaideep Sharma
22c84aaab1 [automerger skipped] audio: Fix Effect worker thread am: 08fe547a3a -s ours
am skip reason: Merged-In If54c8fa62827e5f28e620dd841d638028149b1b8 with SHA-1 632b1cd048 is already in history

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

Change-Id: Ibb17c76ab5b3a4b08fa7c120adbe57319d56a516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 01:19:44 +00:00
Wonsik Kim
8826e9a0ad Merge "media.c2: add apex_available and set minsdk to 31" into main am: bea101032f am: 6590f39160 am: 0dac42e170 am: acf6a65e2b am: ff888f8d07
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2734633

Change-Id: I7a5d586cf73d5aee1f2ad4b7c323169666971e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 00:36:23 +00:00
Ryan Prichard
3fabd96fb1 Merge "Fix nonce uniqueness tests" into main am: 8d333ff410 am: 2abfe4abc7 am: 6187565c08 am: 88a2b9d431 am: 414b9833c3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2758146

Change-Id: I442bda877b1279d7a722f21023de70be873c85a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 00:32:23 +00:00