Commit Graph

42543 Commits

Author SHA1 Message Date
Devin Moore
b48ba49001 Use onUnlinked in health HAL am: 1e1627a5da
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: If1620271aff8805d05d14b08efb5a66279269e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 16:56:26 +00:00
Devin Moore
1e1627a5da Use onUnlinked in health HAL
It's possible to get an onBinderDied callback after a call to
AIBinder_unlinkToDeath() so we can't delete the objects in callbacks_
until we are done using the void* cookie.
Handling the cleanup in onBinderUnlinked will handle the case where we
manually unlink it as well as the case where it's unlinked due to death.

Test: atest VtsHalHealthTargetTest
Bug: 319210610
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e5e95bf5759a736f3debc6eb583fb1c82b38d847)
Merged-In: Iee4783217cc88134af6de0fe66128684ca984dba
Change-Id: Iee4783217cc88134af6de0fe66128684ca984dba
2024-04-30 00:29:24 +00:00
Jerry Wong
830e8db7df audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6) am: 50bf1116fc am: 12b2c93b10 am: bd701ebc51 am: ee5066c40d am: d703b973c8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989191

Change-Id: Ifc456b293e14cf65bb02b963f6d3b3f592d603d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 05:16:28 +00:00
Jerry Wong
d703b973c8 audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6) am: 50bf1116fc am: 12b2c93b10 am: bd701ebc51 am: ee5066c40d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989191

Change-Id: I7c1a3b32e483f9f4173fe80280a8c5827aef7028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 04:31:26 +00:00
Jerry Wong
ee5066c40d audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6) am: 50bf1116fc am: 12b2c93b10 am: bd701ebc51
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989191

Change-Id: I86014692bf87fb9529ff1c05d7141c709674c93f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 03:48:46 +00:00
Jerry Wong
bd701ebc51 audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6) am: 50bf1116fc am: 12b2c93b10
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989191

Change-Id: I629120865fbc3140771352f38b033ddb84bd9d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 03:24:09 +00:00
Jerry Wong
12b2c93b10 audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6) am: 50bf1116fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989191

Change-Id: Ifa60f56a93ed09f1a546989cd8231cb0df97ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 02:39:48 +00:00
Jerry Wong
50bf1116fc audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6)
Bug: 309625094
Test: atest VtsHalAudioV6_0TargetTest

Change-Id: I1f79d33fc05630392587d9a4fb2a3a20a98d6d14
2024-03-05 14:48:57 -08:00
Yu-Han Yang
16a69b7a56 Allow multiple registered GNSS HALs am: 3344506a78 am: f0170e7fd0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2962603

Change-Id: Id78afd740b4eca5528d2de1b8a540a3b003218e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 22:51:49 +00:00
Yu-Han Yang
f0170e7fd0 Allow multiple registered GNSS HALs am: 3344506a78
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2962603

Change-Id: I5e54874bbebc3ca9e9eaf48aef335705b49c7c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 22:07:06 +00:00
Yu-Han Yang
3344506a78 Allow multiple registered GNSS HALs
Bug: 325210998
Change-Id: I1c5e4e37059b6159ffaff310d2d0dd588d35fd7c
Test: atest VtsHalGnssV1_1TargetTest
2024-02-14 22:11:23 +00:00
Treehugger Robot
2a66c96fbd [automerger skipped] Merge "[DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest" into android12L-tests-dev am: 1f3bee1191 -s ours am: 85e1f5e409 -s ours am: 5abcc9becc -s ours
am skip reason: contains skip directive

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

Change-Id: Ifa446fe4e531f1c1264c86bad3ca43a1ee005f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 07:24:24 +00:00
Kevin Karl
36655d325d [automerger skipped] [DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest am: 29a9a9ccfd -s ours am: 8824d06406 -s ours am: 2ffce9080b -s ours
am skip reason: contains skip directive

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

Change-Id: If9cf9ec8f7dca832787a69ea2a87ebfc5069b1cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 07:24:21 +00:00
Treehugger Robot
5abcc9becc [automerger skipped] Merge "[DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest" into android12L-tests-dev am: 1f3bee1191 -s ours am: 85e1f5e409 -s ours
am skip reason: contains skip directive

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

Change-Id: I2cf0e40a84dc75eb6c6239942935cbbbaa69aa30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 06:38:20 +00:00
Kevin Karl
2ffce9080b [automerger skipped] [DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest am: 29a9a9ccfd -s ours am: 8824d06406 -s ours
am skip reason: contains skip directive

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

Change-Id: I9263243b54a362580a9df10a5428e3acd3bb1f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 06:38:15 +00:00
Treehugger Robot
85e1f5e409 [automerger skipped] Merge "[DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest" into android12L-tests-dev am: 1f3bee1191 -s ours
am skip reason: contains skip directive

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

Change-Id: Ie1a578863136c0f34c5dc00e92b7b9604f000971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 05:54:43 +00:00
Kevin Karl
8824d06406 [automerger skipped] [DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest am: 29a9a9ccfd -s ours
am skip reason: contains skip directive

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

Change-Id: Ib6d24f096a57f36adad35f7b6559354f3860769e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 05:54:38 +00:00
Treehugger Robot
1f3bee1191 Merge "[DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest" into android12L-tests-dev 2024-02-06 05:25:19 +00:00
Shawn Willden
b8711a549c [automerger skipped] Merge "Fix AttestKeyTest failures in KeyMint VTS" into android12-tests-dev am: bd01292ab7 am: 198bcf3a6d -s ours am: 9f1f92c4a8 -s ours am: 9ae0d2a353 -s ours
am skip reason: Merged-In I8199e5c7570b10b71f127c7439b889c0b3327865 with SHA-1 981c9c2236 is already in history

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

Change-Id: Ib0bb71722724e247fa64107574d40ad20f2208dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 20:18:09 +00:00
Shawn Willden
71823acf05 [automerger skipped] Merge "Add check_feature helper" into android12-tests-dev am: 61b28ebd18 am: 3756b0c17f -s ours am: dc8281e5a6 -s ours am: 4c1d9f8ab3 -s ours
am skip reason: Merged-In I4a5b2a41172c15ae29efb5b177eb86cea5527b4e with SHA-1 b7d44a2eef is already in history

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

Change-Id: Ib857c4290bd9fe8af3a99d036502d5cbad4294ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 20:18:05 +00:00
Shawn Willden
9ae0d2a353 [automerger skipped] Merge "Fix AttestKeyTest failures in KeyMint VTS" into android12-tests-dev am: bd01292ab7 am: 198bcf3a6d -s ours am: 9f1f92c4a8 -s ours
am skip reason: Merged-In I8199e5c7570b10b71f127c7439b889c0b3327865 with SHA-1 981c9c2236 is already in history

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

Change-Id: I7980f2bc720b7d47a4cf3b45589e25ecbfba908c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 19:31:15 +00:00
Shawn Willden
4c1d9f8ab3 [automerger skipped] Merge "Add check_feature helper" into android12-tests-dev am: 61b28ebd18 am: 3756b0c17f -s ours am: dc8281e5a6 -s ours
am skip reason: Merged-In I4a5b2a41172c15ae29efb5b177eb86cea5527b4e with SHA-1 b7d44a2eef is already in history

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

Change-Id: I326dea4efa451d4db04e94f27d7f1e06e950e5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 19:31:10 +00:00
Shawn Willden
9f1f92c4a8 [automerger skipped] Merge "Fix AttestKeyTest failures in KeyMint VTS" into android12-tests-dev am: bd01292ab7 am: 198bcf3a6d -s ours
am skip reason: Merged-In I8199e5c7570b10b71f127c7439b889c0b3327865 with SHA-1 981c9c2236 is already in history

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

Change-Id: If4d6d688d8e7d0373e3e1edd740ae0c78605134e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 18:49:14 +00:00
Shawn Willden
dc8281e5a6 [automerger skipped] Merge "Add check_feature helper" into android12-tests-dev am: 61b28ebd18 am: 3756b0c17f -s ours
am skip reason: Merged-In I4a5b2a41172c15ae29efb5b177eb86cea5527b4e with SHA-1 b7d44a2eef is already in history

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

Change-Id: I3bab88ae6c301fb8ced89c251e84a21e0e35ec59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 18:49:09 +00:00
Shawn Willden
198bcf3a6d Merge "Fix AttestKeyTest failures in KeyMint VTS" into android12-tests-dev am: bd01292ab7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665235

Change-Id: I6adf3810f97b1af4f4b7afad0059035154944623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 18:12:23 +00:00
Shawn Willden
3756b0c17f Merge "Add check_feature helper" into android12-tests-dev am: 61b28ebd18
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665195

Change-Id: Ic114fba82b35940152193ea95e0f871f9ed4b74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 18:12:19 +00:00
Shawn Willden
bd01292ab7 Merge "Fix AttestKeyTest failures in KeyMint VTS" into android12-tests-dev 2024-02-05 17:44:49 +00:00
Shawn Willden
61b28ebd18 Merge "Add check_feature helper" into android12-tests-dev 2024-02-05 17:44:49 +00:00
Yu Shan
4a7d5e2172 Add retry in setProp test. am: 62fe882688 am: 4381d2445c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2927410

Change-Id: I1bd90fabca970d7d2af989f779c38adb85a45338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 23:25:53 +00:00
Yu Shan
4381d2445c Add retry in setProp test. am: 62fe882688
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2927410

Change-Id: I5360d35a4bca733a09a0a8b944deef6192db408f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 22:42:06 +00:00
Yu Shan
05e396842c Fix HIDL VHAL descriptor name in VTS. am: 928062ccac am: 9319860ef7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2928798

Change-Id: Icdbcc1039c264fa9b80f358429612b1eab6e8794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 22:59:49 +00:00
Yu Shan
9319860ef7 Fix HIDL VHAL descriptor name in VTS. am: 928062ccac
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2928798

Change-Id: I081616ece3f02c244fe2f8e581da24e222e618a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 22:14:44 +00:00
Yu Shan
62fe882688 Add retry in setProp test.
Set property operation is async so getting the property value
immediately after setting the property might not return the new
value. This CL adds the logic to retry when we do not get the
expected values back.

This CL also skips the test case if getting property or setting
property returns unavailable.

Test: atest VtsHalAutomotiveVehicle_TargetTest
Bug: 322070490
Change-Id: If9349a097a92c51101c7b5f4bf807b610ab2cb0b
Merged-In: If9349a097a92c51101c7b5f4bf807b610ab2cb0b
2024-01-29 21:42:42 +00:00
Yu Shan
928062ccac Fix HIDL VHAL descriptor name in VTS.
Bug: 322418005
Test: Manual test with HIDL VHAL, VTS pass.
Change-Id: I93e92d3587243c44b5651ab85d47442ebb64c51a
Merged-In: I93e92d3587243c44b5651ab85d47442ebb64c51a
2024-01-27 02:28:25 +00:00
Kevin Karl
29a9a9ccfd [DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest
setProp test, sets READ_WRITE property and reads prop value immediately,
without considering the time delay Vehicle HAL service required to process
the set request.
This is handled by a retry and timeout mechanism, where the read trials
will happen in 500 milliseconds for a timeout of 2 seconds.

Bug: 312265787
Test: VtsHalAutomotiveVehicleV2_0TargetTest
Change-Id: I5db6d724710033f271064ac81c5178f0dec74b26
2024-01-26 14:47:49 +01:00
Alisher Alikhodjaev
62fee25eb7 Per NCI spec there is no need to wait for credits am: 78c233dc03 am: fb1d325dcc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2917346

Change-Id: Ie01ac3959008da5d3c2883fcdd4a057b1ecdc8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 21:06:00 +00:00
Alisher Alikhodjaev
fb1d325dcc Per NCI spec there is no need to wait for credits am: 78c233dc03
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2917346

Change-Id: I7c105d31d5834a8de1c570a3a0cf4723ca0bf37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 20:19:51 +00:00
Alisher Alikhodjaev
78c233dc03 Per NCI spec there is no need to wait for credits
One case was missed in the previous fix.
This is an update.

Bug: 312911587
Test: no regressions
Change-Id: I7fefa92d5a66581431288ec902a56ed61e9cf310
(cherry picked from commit 46d9630125)
2024-01-18 17:29:52 +00:00
Treehugger Robot
06f2489657 Merge "Modify CameraUseStreamConfigToDisplay" into android13-tests-dev am: 4c7a5de957 am: 1ad77324aa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2911485

Change-Id: Ie9ab06364618f6443413ad72b6bca9923b8d21f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 05:48:43 +00:00
Treehugger Robot
1ad77324aa Merge "Modify CameraUseStreamConfigToDisplay" into android13-tests-dev am: 4c7a5de957
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2911485

Change-Id: I897351c977ca13a3bd3e053d0aa9de746d31f991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 05:02:51 +00:00
Treehugger Robot
6b83c785cd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12-tests-dev am: a3ca13869f -s ours am: d6d89e064c -s ours am: 4ffdc10d06 -s ours am: 45883820c0 -s ours
am skip reason: contains skip directive

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

Change-Id: I9c36b298863e790f1e47f1fe85bc834e20bb28ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 04:44:38 +00:00
Changyeon Jo
53df1e9f2f [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 2180645f10 -s ours am: d9483b87bc -s ours am: 5c95074b1e -s ours am: 9a9e9afa56 -s ours
am skip reason: contains skip directive

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

Change-Id: I7c4ab00f978fdde301099a15b5b301c3c0f30e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 04:44:35 +00:00
Treehugger Robot
0dd03d7cdb [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12L-tests-dev am: 294d32e264 -s ours am: 656eae1fb4 -s ours am: 1484088381 -s ours
am skip reason: contains skip directive

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

Change-Id: I4f75bb5679fe745fe3a750e1c10f3f6eb45b1739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 04:44:20 +00:00
Changyeon Jo
6107000711 [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 6d9717bcb8 -s ours am: 87f0184973 -s ours am: 2f8e18583c -s ours
am skip reason: contains skip directive

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

Change-Id: I18508dc50ce951120445c3a0005c054b24b2a2fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 04:44:16 +00:00
Treehugger Robot
4c7a5de957 Merge "Modify CameraUseStreamConfigToDisplay" into android13-tests-dev 2024-01-18 04:20:19 +00:00
Treehugger Robot
45883820c0 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12-tests-dev am: a3ca13869f -s ours am: d6d89e064c -s ours am: 4ffdc10d06 -s ours
am skip reason: contains skip directive

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

Change-Id: Iac49cf2ef7d16d102d95792394d71fa10f5618f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:58:50 +00:00
Changyeon Jo
9a9e9afa56 [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 2180645f10 -s ours am: d9483b87bc -s ours am: 5c95074b1e -s ours
am skip reason: contains skip directive

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

Change-Id: Iac21c7d5d683b574172d252c2e5b1934e9a60871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:58:46 +00:00
Treehugger Robot
1484088381 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12L-tests-dev am: 294d32e264 -s ours am: 656eae1fb4 -s ours
am skip reason: contains skip directive

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

Change-Id: I7c0e2d53ea630b47262dd5584912308fcfc367a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:58:32 +00:00
Changyeon Jo
2f8e18583c [automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: 6d9717bcb8 -s ours am: 87f0184973 -s ours
am skip reason: contains skip directive

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

Change-Id: Icacd028733f6851a9e4892e45c61501f9c51d5ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:58:28 +00:00
Treehugger Robot
4ffdc10d06 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android12-tests-dev am: a3ca13869f -s ours am: d6d89e064c -s ours
am skip reason: contains skip directive

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

Change-Id: Ic93a8ced0b53c6cc41d222cb5ec4bce70c1ca7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:37:08 +00:00