Changyeon Jo
862a59d5d9
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: 8c63e65e1e -s ours am: dd1654cb7c -s ours am: 713bca322a -s ours am: 7af2ed0409 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I0c13c01a4764087b7e647c8d79b3bd2b97b98c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 06:06:40 +00:00
Treehugger Robot
54e9f6de83
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours am: 7d4805ed3b -s ours am: 678a31c32f -s ours am: 3f62d55bca -s ours am: db07f89f28 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Ifeeb9972fde2cf1c8c7878b18e21098d1c24a661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 06:06:24 +00:00
Changyeon Jo
d67ecd6c2a
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: a54bde0496 -s ours am: ff1266211f -s ours am: e37af4ab40 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Ia61cbe7f2c7fb9a226b8d3328b3d33fd0e14e318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 06:06:01 +00:00
Changyeon Jo
7af2ed0409
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: 8c63e65e1e -s ours am: dd1654cb7c -s ours am: 713bca322a -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: If3ffc9683b53bbd49f5a85ed4ca2b8cfc02bbbdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 05:44:43 +00:00
Changyeon Jo
713bca322a
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: 8c63e65e1e -s ours am: dd1654cb7c -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Ia06d63d1a05460bc0bc27d9bb2c370ae41cd7b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 05:23:36 +00:00
Treehugger Robot
db07f89f28
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours am: 7d4805ed3b -s ours am: 678a31c32f -s ours am: 3f62d55bca -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Ic72d3d2a3c88c53b671eceaf4b87482d706027cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 05:22:20 +00:00
Changyeon Jo
e37af4ab40
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: a54bde0496 -s ours am: ff1266211f -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Ifeda885e797120c38b53348f2a2a6d92b8a38d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 05:22:06 +00:00
Treehugger Robot
8684d94d45
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours am: 7d4805ed3b -s ours am: 678a31c32f -s ours am: 6338b15216 -s ours am: 37617a8a05 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I03b993cf633657960cd3ff3aee604daf5abd91e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 05:20:33 +00:00
Changyeon Jo
f2e0b9e321
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: a54bde0496 -s ours am: e6d75506d8 -s ours am: 18ec3bcd46 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: If36e9841d465ee964f03851ee693b9de65948539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 05:20:29 +00:00
Zhanglong Xia
bb30228f22
Merge "Ignores vim temporary files from git" into main am: 1392cbc773 am: 9b0fd2127f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2910722
Change-Id: I49b7f51c1b54ef204779d48b18ab1de4b7665c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 05:20:15 +00:00
Treehugger Robot
37617a8a05
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours am: 7d4805ed3b -s ours am: 678a31c32f -s ours am: 6338b15216 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I2e2ce7a8734767ac7985ea29c12aa9267de6224a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 04:40:47 +00:00
Changyeon Jo
18ec3bcd46
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: a54bde0496 -s ours am: e6d75506d8 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Ieb0f3122db2600da83bad3fe6079eabf45c44b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 04:40:44 +00:00
Zhanglong Xia
9b0fd2127f
Merge "Ignores vim temporary files from git" into main am: 1392cbc773
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2910722
Change-Id: Iac999447b626b1a847bc8836ba8db7e8cab09d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 04:40:33 +00:00
Treehugger Robot
3f62d55bca
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours am: 7d4805ed3b -s ours am: 678a31c32f -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Ib095874203e0b55db4d877667f2a95d34ad7e581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 04:38:52 +00:00
Changyeon Jo
ff1266211f
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: a54bde0496 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Ic220ed41ecfec30c38b7e16e8f6457460d397727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 04:38:43 +00:00
Changyeon Jo
dd1654cb7c
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: 8c63e65e1e -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I14429fc588124e6dd699855eecb76bded0ca4bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 04:38:40 +00:00
Treehugger Robot
6338b15216
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours am: 7d4805ed3b -s ours am: 678a31c32f -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I1fa27ca449fafa8e7fca66666a5ad096e74d3e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 04:19:02 +00:00
Changyeon Jo
e6d75506d8
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours am: a54bde0496 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Ic12c33eb475d1f1c79a26c59caf2304aa0cef5fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 04:18:58 +00:00
Zhanglong Xia
1392cbc773
Merge "Ignores vim temporary files from git" into main
2024-01-17 03:55:04 +00:00
Treehugger Robot
678a31c32f
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours am: 7d4805ed3b -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I091b0d56deaf6a7dd378005d3e04faa3ec153bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 03:54:52 +00:00
Changyeon Jo
a54bde0496
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Iad7425ea5acc23b02e87d3e5d09f46e3bf3a6b59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 03:54:48 +00:00
Chienyuan Huang
fd5abe2db0
Merge "Handle review feedback for android.hardware.bluetooth.ranging" into main am: 6327722e10 am: d78c36e814
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2897641
Change-Id: I0a0571fbeab5e10b1af7db19dd2087b4fdca40e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 03:53:29 +00:00
Changyeon Jo
8c63e65e1e
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours am: f1cb5e825d -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Iede71c0191040e3b13a43533c2c006e4a955b369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 03:53:09 +00:00
Treehugger Robot
7d4805ed3b
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours am: 08af1350ce -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: Id5d47a991d782b737bd14b9eb2bd9f73a150a2de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 03:10:18 +00:00
Changyeon Jo
f1cb5e825d
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours am: 43473d142f -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I605705197f69a9dde2334c5cc74e7eaf5f955107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 03:10:15 +00:00
Chienyuan Huang
d78c36e814
Merge "Handle review feedback for android.hardware.bluetooth.ranging" into main am: 6327722e10
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2897641
Change-Id: I26dfa56c009380e20d3c307cef3de269466db847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 03:10:08 +00:00
Treehugger Robot
08af1350ce
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours am: fcec28ee4c -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I3d68b4a7ac48ae0e44303f718c4e18b50039d98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 02:49:21 +00:00
Changyeon Jo
43473d142f
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours am: 7ea8d84859 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I1ab6710d4fa6aa41338baabf37392ae1ac3d4cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 02:49:19 +00:00
Chienyuan Huang
6327722e10
Merge "Handle review feedback for android.hardware.bluetooth.ranging" into main
2024-01-17 02:34:21 +00:00
Treehugger Robot
fcec28ee4c
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914 -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I403b8ad142a1d73f34cb7e58d3b66a6598aac6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 02:05:43 +00:00
Changyeon Jo
7ea8d84859
[automerger skipped] [RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay am: d5732b6bbf -s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892
Change-Id: I11c67b1de8d351a1350cb693869d459ba970312a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 02:05:40 +00:00
Treehugger Robot
72b6e65914
Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev
2024-01-17 01:30:09 +00:00
Weilin Xu
4a67014830
Merge "Add tests for generic bcradio HAL utils methods" into main
2024-01-16 22:13:45 +00:00
Treehugger Robot
59513708a9
Merge "compatibility matrices: drop optional=true. (4~8)" into main am: 1014102ee6 am: ae3e2648d3
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2909099
Change-Id: I007171cc585da54592944d803e538359dde1df88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 21:45:38 +00:00
Weilin Xu
ff28474bd5
Merge "Add metadata format check in bcradio VTS" into main
2024-01-16 21:33:06 +00:00
Weilin Xu
f4cfe19efd
Add tests for generic bcradio HAL utils methods
...
Added unit tests for generic methods in utils library for AIDL
broadcast radio HAL.
Bug: 310708886
Test: atest broadcastradio_utils_aidl_test
Change-Id: I968d43c82cd5f9179a63438845dfa167bc30f2cc
2024-01-16 13:22:12 -08:00
Changyeon Jo
d5732b6bbf
[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay
...
Exclude logical camera devices from CameraUseStreamConfigToDisplay test
case.
Bug: 275049370
Test: atest VtsHalEvsV1_0TargetTest and
atest VtsHalEvsV1_1TargetTest
Change-Id: If6b31d94bdbffd2f4e9ab9bd5c8957ec85904187
2024-01-16 21:14:30 +00:00
Treehugger Robot
ae3e2648d3
Merge "compatibility matrices: drop optional=true. (4~8)" into main am: 1014102ee6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2909099
Change-Id: I0ab97009bd6bd61e4a494719a64ba4937cfe400c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 21:00:38 +00:00
Treehugger Robot
1014102ee6
Merge "compatibility matrices: drop optional=true. (4~8)" into main
2024-01-16 20:03:16 +00:00
Automerger Merge Worker
3f542f9558
Merge "VTS to use enum for MissingAction am: 84187967cb am: 37813dbd44" into main
2024-01-16 19:24:34 +00:00
Automerger Merge Worker
20ab97cb50
Merge changes from topic "am-2e647881ce104264b8a631091fd837ae" into main
...
* changes:
Merge changes from topic "bufferpool2-V2" into main am: 04b5d6679b am: 1b909f4807
media.bufferpool2: support AHardwareBuffer based buffer am: 71ef1c1559 am: 5edd8f2b96
2024-01-16 19:24:20 +00:00
Shikha Panwar
206a12d04e
VTS to use enum for MissingAction am: 84187967cb am: 37813dbd44
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2909582
Change-Id: I11ab91c91378f51c837723df1250db8ab6604b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 19:24:20 +00:00
Sungtak Lee
dafcd49303
Merge changes from topic "bufferpool2-V2" into main am: 04b5d6679b am: 1b909f4807
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2906625
Change-Id: I9ca93d8c70506d0326f30b071b5cfe7f264ca715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 19:24:04 +00:00
Sungtak Lee
7828b091eb
Merge changes from topic "bufferpool2-V2" into main am: 04b5d6679b am: 1b909f4807
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2906625
Change-Id: I9561c3d4e26c94762002690e7c2cdc10b4147cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 19:23:59 +00:00
Sungtak Lee
0f684422a9
media.bufferpool2: support AHardwareBuffer based buffer am: 71ef1c1559 am: 5edd8f2b96
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2907297
Change-Id: I9a94d3b2d50ec9c5779f36b67bb6087d83e39fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 19:23:57 +00:00
Sungtak Lee
849b273360
media.bufferpool2: support AHardwareBuffer based buffer am: 71ef1c1559 am: 5edd8f2b96
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2907297
Change-Id: I1e7c449baeb7d38c8c81a76c3e9c2c37c658c089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 19:23:54 +00:00
Shunkai Yao
66050a559f
[automerger skipped] Merge "Effect VTS: update VtsHalDownmixTargetTest for data validation" into main am: 78265377d9 am: 975a0006cb -s ours
...
am skip reason: Merged-In I0dc0009e1779b842a4f3cdcc047d225310a304f9 with SHA-1 7d96d9e0ff is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2908622
Change-Id: I558f514eb89461593e8f344db78f31856bf27751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 19:23:31 +00:00
Devin Moore
eb85ecda06
Merge "[conflict] Merge "Rename compatibility_matrix.9.xml to compatibility_matrix.202404.xml" into main am: 89c395a850 am: 9862527094 am: e346798006" into main
2024-01-16 18:34:12 +00:00
Devin Moore
a47b07744e
[conflict] Merge "Rename compatibility_matrix.9.xml to compatibility_matrix.202404.xml" into main am: 89c395a850 am: 9862527094 am: e346798006
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2907790
Needed to copy the existing compatibility_matrix.9.xml from this target branch to the new compatibility_matrix.202404.xml file.
Change-Id: I71ef6ce9b6039ed757caa5ddc257970732a454e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 17:22:00 +00:00
Shuzhen Wang
84bc4a190d
Merge "Camera: Allow non-session parameters in SessionConfiguration" into main
2024-01-16 16:38:31 +00:00