Commit graph

61895 commits

Author SHA1 Message Date
Changyeon Jo
b76bbb8d72 [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: d69178ad34 -s ours am: 4e717156ce -s ours am: cfdde09b34 -s ours am: fddc9bbe78 -s ours am: 7e07c0dde1 -s ours am: 65f50a0cfa -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

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

Change-Id: Ie843bf611f591abe187f59439a4b4a164c9df24e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:54 +00:00
Treehugger Robot
baac84ee38 Merge "Add a config with test skipping for SDK < 33" into android13-tests-dev am: 632438dc9e am: 0591fbbcb4 am: c9c0815d4a am: 6e9ec671b0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2787019

Change-Id: If88a98cc16f87963c9ca6498a9eaa88d3195097d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:43 +00:00
Changyeon Jo
2bc2077509 [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: d69178ad34 -s ours am: 410a598a1a -s ours am: 0f94b0a867 -s ours am: 8f2ba28089 -s ours am: 8e5e8a6d18 -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

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

Change-Id: I43f786e92959f0cccd516f6f6f86cddd8c70f3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:33 +00:00
Changyeon Jo
62eef91772 [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: 2405c6f40e -s ours am: 3c67792054 -s ours am: 7508fad55f -s ours am: f31f93fedc -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

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

Change-Id: I0018613fdfa671c3a01e68da63872f73cba2eb42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:23 +00:00
Jooyung Han
96420d0f47 Merge "Cleanup: use a shared apex_key" into main am: b0675a2ecb am: 5c90b3b7f1 am: 5df65b5638
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780307

Change-Id: Ic01f7e230bc520e76d270ec713e04056d68c078f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:13 +00:00
Jooyung Han
fa1bb85fca Merge "Cleanup: use shared apex_key (fingerprint APEX)" into main am: 52dec402f0 am: 5e4770c7f0 am: 7e3a2446b8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780313

Change-Id: I7e30be88708f6fe3df21f82843f462a6f2253a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:02 +00:00
Jooyung Han
c0592192b5 Merge "Cleanup: move VINTF fragment into VAPEX" into main am: e8d679e223 am: 65a3102d41 am: 73850fb99f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780410

Change-Id: I6be15609a22f97e6507e237e0d2398dd4e695963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:45:52 +00:00
Changyeon Jo
3e5b2390e8 [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: 64d009118f -s ours am: e4dc17e4cc -s ours am: 35f99051e3 -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

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

Change-Id: I4bd024f0e1b026c789ce90eea2742f34390a8087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:45:41 +00:00
Shunkai Yao
873ad88b82 Merge "Fix cts Pre/post Processing failures on Cuttlefish aidl" into main am: 48415986d9 am: 108782bcfd am: 035ab7b720
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794102

Change-Id: Ib8b26e19289753eac1ad3b8cf87e4a51f6c75109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:45:27 +00:00
Changyeon Jo
bf66fd8937 Merge "Update CameraStreamBuffering test and correct instance name" into main am: 945c9aa1de am: a7e5836f4e am: ad8f18eb18
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2796792

Change-Id: I8e2483e68f5b0752d85d948de56baf1e8185915c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:24:13 +00:00
Mikhail Naganov
4a8490f91d audio: Use hardcoded r_submix configuration with XML am: fc35ca3d32 am: 1e67ba3e09 am: 6915cc4812
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794109

Change-Id: I770911caacfb740d19caa719498c12138da38634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:07:34 +00:00
Lorena Torres-Huerta
02b419d8b0 audio: Set connectedProfiles for non-attached device ports. am: f7492518c7 am: 72a4dbc9a5 am: 3108b3aac6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794108

Change-Id: If77993d47b9a0aa3df1db58b9b88db73487cc75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:07:31 +00:00
Lorena Torres-Huerta
8753e9af8c audio: Populate MicrophoneInfo with vendor data am: 533cc78aab am: 505834f376 am: 3d3aad42f9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794107

Change-Id: I74034420b0e022c8c798a5ae9d45eed5bd6a42a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:07:27 +00:00
Mikhail Naganov
ec53542fe7 audio: Implement proper parsing of masks in XsdcConversion am: cc21b6f2e6 am: 9f2c28f89d am: b6e9758ead
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794106

Change-Id: I2a74913525ece4b5efd612f922e8f532514fdcfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:07:20 +00:00
Lorena Torres-Huerta
7b4fb1aee7 audio: Parse module configurations from the APM XML files am: 394e2527b5 am: 53e0782ad4 am: e6715cec34
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794105

Change-Id: Ibeb7cdf2aa0152555dc307168e81ee2dadb8dae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:07:16 +00:00
Jooyung Han
baaa27b411 Merge "Use explicit requirements from APEX" into main am: 5de1785959 am: ea79c3a3b4 am: bed6c5bb00
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2785639

Change-Id: Id93d843b36956a13c86510a51817dffe168035b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:06:59 +00:00
Yu Shan
9a840a12ab [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: 1983edaebc -s ours am: 38bda7a86f -s ours am: 4eac643b64 -s ours am: 85b6e55b26 -s ours am: ece151d91a -s ours am: 5042161c75 -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

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

Change-Id: Ie33b1d0e95dffe7c997c21f58d99e5b55f9d102e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:06:47 +00:00
Yu Shan
bab4cffdb6 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: 1983edaebc -s ours am: 1b4a1145b4 -s ours am: 0227be3bfb -s ours am: 6cd08f0e2b -s ours am: 1a772a389d -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

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

Change-Id: I6c5573a09d63e7b517b2767bf7206ea7226fb3cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:06:35 +00:00
Yu Shan
12de5f41d3 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: 76623de19a -s ours am: acb6dddec5 -s ours am: 0c2e442597 -s ours am: 43852bcc91 -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

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

Change-Id: Ifb3c7a058e67150708991327418ee86fd85c1996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:06:23 +00:00
Yu Shan
9352746375 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: abb7c878b0 -s ours am: 6eed0ed069 -s ours am: 36fbae6109 -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

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

Change-Id: I873ccb4d5132d7affb21e0e9b55f10a65e4b984d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 01:46:05 +00:00
Jooyung Han
5d1e45521e Merge "Cleanup: use shared apex_key (wifi HAL APEX)" into main am: de82b61de8 am: 5a92d4a379 am: 7af34a3117
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780370

Change-Id: Ieda357045a2424ec659c6b0faa663ea3763a25ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 01:21:32 +00:00
Treehugger Robot
0f98a4e6d2 Merge "Cleanup: use shared apex_key" into main am: 254c650c58 am: d109330b0e am: abc37c40b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780409

Change-Id: I5becdf080f5bf7ca7307e92c6152ff1fcb749a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 01:21:21 +00:00
Xin Li
12d4ca1e29 [automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 3d862c9608 -s ours am: 4fe31ce727 -s ours
am skip reason: Merged-In I27fe6f65f491db9d88710cf163eba12079499a09 with SHA-1 f7e0442a7b is already in history

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

Change-Id: I025ae3b062bae97d50e892e5def29acc566bff15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:58:58 +00:00
Xin Li
805f18e3d8 [automerger skipped] Merge 10952656 am: 84fe582d6e -s ours am: 2d03aee5eb -s ours
am skip reason: Merged-In I27fe6f65f491db9d88710cf163eba12079499a09 with SHA-1 f7e0442a7b is already in history

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

Change-Id: Ic29664f3166db1808c655ade1a77026b370cd47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:55:08 +00:00
Shunkai Yao
fb263ea992 Merge "Add defaults for audio AIDL interfaces" into main 2023-10-19 23:14:22 +00:00
Changyeon Jo
65f50a0cfa [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: d69178ad34 -s ours am: 4e717156ce -s ours am: cfdde09b34 -s ours am: fddc9bbe78 -s ours am: 7e07c0dde1 -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

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

Change-Id: Ief3787caa1d4d96fa7ff60ce87bd84f321706d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 22:22:35 +00:00
Treehugger Robot
6e9ec671b0 Merge "Add a config with test skipping for SDK < 33" into android13-tests-dev am: 632438dc9e am: 0591fbbcb4 am: c9c0815d4a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2787019

Change-Id: I9ee9d844960784654a52d45ec89afdbed9a2ae3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 22:19:46 +00:00
Changyeon Jo
8e5e8a6d18 [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: d69178ad34 -s ours am: 410a598a1a -s ours am: 0f94b0a867 -s ours am: 8f2ba28089 -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

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

Change-Id: I55cdd63fcbc506ddaec7273004b9d6347ead2ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 22:17:10 +00:00
Changyeon Jo
f31f93fedc [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: 2405c6f40e -s ours am: 3c67792054 -s ours am: 7508fad55f -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

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

Change-Id: Ib03cd0150f3869cdeedc7e736c59869903fcf957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 22:13:17 +00:00
Jooyung Han
5df65b5638 Merge "Cleanup: use a shared apex_key" into main am: b0675a2ecb am: 5c90b3b7f1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780307

Change-Id: I238daac63d919d264333c05426619c7ccda2b31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 22:08:35 +00:00
Jooyung Han
7e3a2446b8 Merge "Cleanup: use shared apex_key (fingerprint APEX)" into main am: 52dec402f0 am: 5e4770c7f0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780313

Change-Id: I1caae46ef68b770305682714359186776512c591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 21:59:42 +00:00
Jooyung Han
73850fb99f Merge "Cleanup: move VINTF fragment into VAPEX" into main am: e8d679e223 am: 65a3102d41
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780410

Change-Id: I41904fd8a8ea962e148911ed9a7290f5686f9120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 21:57:41 +00:00
Changyeon Jo
35f99051e3 [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: 64d009118f -s ours am: e4dc17e4cc -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

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

Change-Id: Ic2001cc27d4b8c55309472f4b1b5714da6e4a09b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 21:52:24 +00:00
Shunkai Yao
035ab7b720 Merge "Fix cts Pre/post Processing failures on Cuttlefish aidl" into main am: 48415986d9 am: 108782bcfd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794102

Change-Id: Ia21fed433df105d8bf4d72175a6936be05e48330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 21:25:18 +00:00
Changyeon Jo
ad8f18eb18 Merge "Update CameraStreamBuffering test and correct instance name" into main am: 945c9aa1de am: a7e5836f4e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2796792

Change-Id: I4d006e3f82c69dbf36af0682230696da40109216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:39:19 +00:00
Mikhail Naganov
6915cc4812 audio: Use hardcoded r_submix configuration with XML am: fc35ca3d32 am: 1e67ba3e09
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794109

Change-Id: I0dcfaa25a67e7f2ad770cf6168ca5e56c7f75838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:18:25 +00:00
Lorena Torres-Huerta
3108b3aac6 audio: Set connectedProfiles for non-attached device ports. am: f7492518c7 am: 72a4dbc9a5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794108

Change-Id: I6fce7255295eeb0164fa2944fef8f7bcecb6ea08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:18:21 +00:00
Lorena Torres-Huerta
3d3aad42f9 audio: Populate MicrophoneInfo with vendor data am: 533cc78aab am: 505834f376
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794107

Change-Id: Ibf0c8a638c92862209fdca37a7da8e628d7ca984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:18:17 +00:00
Mikhail Naganov
b6e9758ead audio: Implement proper parsing of masks in XsdcConversion am: cc21b6f2e6 am: 9f2c28f89d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794106

Change-Id: I453f357da30ff41f52680597f5b5b508e14d9453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:18:11 +00:00
Lorena Torres-Huerta
e6715cec34 audio: Parse module configurations from the APM XML files am: 394e2527b5 am: 53e0782ad4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794105

Change-Id: I626f9be81e5a9f6b19ac7a980c4574423525b22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:18:07 +00:00
Jooyung Han
bed6c5bb00 Merge "Use explicit requirements from APEX" into main am: 5de1785959 am: ea79c3a3b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2785639

Change-Id: I72bf304817a74e3658ddcab001c600c4a3718077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:17:51 +00:00
Yu Shan
5042161c75 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: 1983edaebc -s ours am: 38bda7a86f -s ours am: 4eac643b64 -s ours am: 85b6e55b26 -s ours am: ece151d91a -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

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

Change-Id: I954e476cbd05e5516936789dee2569ba1ff3ef18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:17:42 +00:00
Yu Shan
1a772a389d [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: 1983edaebc -s ours am: 1b4a1145b4 -s ours am: 0227be3bfb -s ours am: 6cd08f0e2b -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

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

Change-Id: I35f1c7e946c999266b796787666a76fcd8664cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:17:34 +00:00
Yu Shan
43852bcc91 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: 76623de19a -s ours am: acb6dddec5 -s ours am: 0c2e442597 -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

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

Change-Id: I24544a28afbcb649dce1e4634a391f5fce3f4c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:17:24 +00:00
Yu Shan
36fbae6109 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: abb7c878b0 -s ours am: 6eed0ed069 -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

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

Change-Id: I75e915e16e466aabfb6932cdf771eb08f796f662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:17:14 +00:00
Jooyung Han
7af34a3117 Merge "Cleanup: use shared apex_key (wifi HAL APEX)" into main am: de82b61de8 am: 5a92d4a379
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780370

Change-Id: Id3f7f542811bbf77e9d48b7b644a0cd0b5337305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:01:58 +00:00
Treehugger Robot
abc37c40b4 Merge "Cleanup: use shared apex_key" into main am: 254c650c58 am: d109330b0e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780409

Change-Id: I34aa754f7312b7f9f8d64eaaca350d8da7e4a45c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 19:47:27 +00:00
Xin Li
4fe31ce727 [automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 3d862c9608 -s ours
am skip reason: Merged-In I27fe6f65f491db9d88710cf163eba12079499a09 with SHA-1 f7e0442a7b is already in history

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

Change-Id: Iadd1cfa349baa842a1effaa4cd9e18d9ca491d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:52:09 +00:00
Xin Li
2d03aee5eb [automerger skipped] Merge 10952656 am: 84fe582d6e -s ours
am skip reason: Merged-In I27fe6f65f491db9d88710cf163eba12079499a09 with SHA-1 f7e0442a7b is already in history

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

Change-Id: I9ab14c531cc02fcd97e3ef2901edd44ae4750b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:48:22 +00:00
Xin Li
3d862c9608 Merge "Merge 10952656" into aosp-main-future 2023-10-19 17:58:46 +00:00