Commit Graph

56195 Commits

Author SHA1 Message Date
Devin Moore
2de00a18fd Merge changes from topic "aosp_trunk_stable_cp" into udc-dev-plus-aosp am: 4d6b500150
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24642593

Change-Id: Ief80344bbb1367fc347ef1c3dcfea5209f4533cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 19:02:56 +00:00
Devin Moore
dfc8482f16 Mark some HALs as updatable-via-apex retroactively am: 9c8fc4b81d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24642592

Change-Id: I16854097866d1c4ff197e14ca6b8294da831a07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 19:02:52 +00:00
Devin Moore
4d6b500150 Merge changes from topic "aosp_trunk_stable_cp" into udc-dev-plus-aosp
* changes:
  Remove compatibility_matrix.9.xml from 'next' builds
  Mark some HALs as updatable-via-apex retroactively
2023-09-06 18:18:00 +00:00
Alice Wang
ee506ee3b2 Merge "Make android.hardware.security.rkp-rust available for virt apex" into main am: 01fc1b7279 am: e537902a03 am: 25840d3f6a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727795

Change-Id: I7d048c6647d89ba1f1bc4350d4dff88eba221377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 09:39:10 +00:00
Alice Wang
25840d3f6a Merge "Make android.hardware.security.rkp-rust available for virt apex" into main am: 01fc1b7279 am: e537902a03
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727795

Change-Id: I22a29aab8bae67cd0e06b979c92e963b8d60659b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 08:54:14 +00:00
David Drysdale
8ba5eeebbe Merge "Summarize security HALs" into main am: 06717b5ec2 am: d8fecae7a1 am: 6728e640d7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727975

Change-Id: I422a2ff53f9c8f56b53722af4621550e078eee87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 08:07:34 +00:00
Alice Wang
e537902a03 Merge "Make android.hardware.security.rkp-rust available for virt apex" into main am: 01fc1b7279
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727795

Change-Id: Ida99a60bf01d57ea1853f8b2c72746805ee20c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 08:04:00 +00:00
Alice Wang
01fc1b7279 Merge "Make android.hardware.security.rkp-rust available for virt apex" into main 2023-09-06 07:36:55 +00:00
David Drysdale
6728e640d7 Merge "Summarize security HALs" into main am: 06717b5ec2 am: d8fecae7a1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727975

Change-Id: I04108b52b235823e68dc3781d8e9e42025dbbafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 07:22:03 +00:00
Changyeon Jo
8de98a639b Update OWNERS file am: bacdd1ec09 am: d095b7aafa am: e927deb8f8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740885

Change-Id: Ibdc0498ee7f36277ee028b559b04f978a4f3df54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 06:34:32 +00:00
David Drysdale
d8fecae7a1 Merge "Summarize security HALs" into main am: 06717b5ec2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727975

Change-Id: Ib3aa50a0fe48d6ec148f027bdcdbdcb0abe019e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 06:29:31 +00:00
David Drysdale
06717b5ec2 Merge "Summarize security HALs" into main 2023-09-06 06:04:26 +00:00
Changyeon Jo
e927deb8f8 Update OWNERS file am: bacdd1ec09 am: d095b7aafa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740885

Change-Id: I5989f85074d670a48a51dac0f0471e3796d7e572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 05:45:56 +00:00
Seth Moore
32151bcf00 [automerger skipped] Only require RKP on T+ chipsets am: 166d160b78 am: 6cc8f1e039 -s ours am: 145d343279 -s ours
am skip reason: Merged-In I387e5f058ada698747aac103c1745682291f2d1c with SHA-1 8be875e0d0 is already in history

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

Change-Id: I3a502915a74615f967d91bc5e011e168c9fae2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 05:45:07 +00:00
Seth Moore
ad409fc86a [automerger skipped] Only require RKP on T+ chipsets am: 166d160b78 am: 6cc8f1e039 am: 7f60034c16 -s ours
am skip reason: Merged-In I387e5f058ada698747aac103c1745682291f2d1c with SHA-1 8be875e0d0 is already in history

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

Change-Id: I2569c462bce61e18a62f920a7d49a6c26a5d237b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 05:43:24 +00:00
Changyeon Jo
d095b7aafa Update OWNERS file am: bacdd1ec09
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740885

Change-Id: Ie6784053acee05538e6d328d98c7cea1730291a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:55:17 +00:00
Seth Moore
7f60034c16 Only require RKP on T+ chipsets am: 166d160b78 am: 6cc8f1e039
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24668282

Change-Id: I7fcd8288a07c865761d38790d785aecd6a8023a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:52:54 +00:00
Seth Moore
145d343279 [automerger skipped] Only require RKP on T+ chipsets am: 166d160b78 am: 6cc8f1e039 -s ours
am skip reason: Merged-In I387e5f058ada698747aac103c1745682291f2d1c with SHA-1 8be875e0d0 is already in history

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

Change-Id: I9cfb72e80726a2ab940d1ac33f5ce4f948d5720b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:49:33 +00:00
Seth Moore
6cc8f1e039 Only require RKP on T+ chipsets am: 166d160b78
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24668282

Change-Id: I9d04efcf7fe7e29dc63f45b5a70226ffdf7cf5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:01:28 +00:00
Changyeon Jo
bacdd1ec09 Update OWNERS file
This change updates OWNERS file for EVS interface.

Bug: 299195329
Test: Manual
Change-Id: Ife421b8aa4a380d8585e6d8476f0a24f31bc2633
2023-09-06 00:57:59 +00:00
Seth Moore
166d160b78 Only require RKP on T+ chipsets
It turns out we had a bug (b/263844771) in how RKP support was
detected, and that was fixed. However, due to this bug, some S chipests
shipped without RKP support which is now required by the tests.

This change drops the RKP requirement from S chipsets. There should be
no new S chipsets, so this effectively grandfathers in the previous
ones that were skipped by the RKP VTS tests.

T+ tests (both VTS and other suites) will verify that RKP support is
there, so there is no gap introduced by this change.

Bug: 297139913
Test: VtsAidlKeyMintTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:8be875e0d0c18b8de67744c8b9629f2ff518dd60)
Merged-In: I387e5f058ada698747aac103c1745682291f2d1c
Change-Id: I387e5f058ada698747aac103c1745682291f2d1c
2023-09-06 00:03:53 +00:00
Emilian Peev
99be4bb76d Camera VTS: Wait for camera provider to become active am: bd4cdc6a9a am: 9610556686 am: 16ce2fc577
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24665985

Change-Id: Iab404b5fada200e9bc8c3cd8ea51290495194edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 22:44:52 +00:00
Emilian Peev
ae137194cb Camera VTS: Wait for camera provider to become active am: bd4cdc6a9a am: 9610556686 am: 1fc69b0038
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24665985

Change-Id: I84939f231d2b347e8cc26cccdd75c9284e166a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 22:43:04 +00:00
Emilian Peev
1fc69b0038 Camera VTS: Wait for camera provider to become active am: bd4cdc6a9a am: 9610556686
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24665985

Change-Id: I64fa6f06b7d13a8fd0e137981c1f5bc8dd524c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:53:36 +00:00
Emilian Peev
16ce2fc577 Camera VTS: Wait for camera provider to become active am: bd4cdc6a9a am: 9610556686
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24665985

Change-Id: Iefca832a6c244f0df88cf9e3898da282612a95d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:50:25 +00:00
Emilian Peev
9610556686 Camera VTS: Wait for camera provider to become active am: bd4cdc6a9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24665985

Change-Id: I021269d8c8301c78dc7d340d2a56e0263181229f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:03:45 +00:00
Xin Li
9ab1449cb2 [automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 71f31d7f37 -s ours am: 03d27ae173 -s ours
am skip reason: Merged-In I421c13e65efa565753337dc21e6520682e726e81 with SHA-1 f0c772199b is already in history

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

Change-Id: I4935323cf26c915d3b27b7b67bcff9de431257cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:35:59 +00:00
Xin Li
2a32a39c94 [automerger skipped] Merge UP1A.230905.019 am: 2b8cabe73b -s ours am: 467cb0db87 -s ours
am skip reason: Merged-In I421c13e65efa565753337dc21e6520682e726e81 with SHA-1 f0c772199b is already in history

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

Change-Id: I3e165ba8b704c99fd982260dee3fc523077503aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 20:34:45 +00:00
Xin Li
03d27ae173 [automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 71f31d7f37 -s ours
am skip reason: Merged-In I421c13e65efa565753337dc21e6520682e726e81 with SHA-1 f0c772199b is already in history

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

Change-Id: I24d1153d9cd15aeb084486a1b582f44e8bdbe868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:46:40 +00:00
Xin Li
467cb0db87 [automerger skipped] Merge UP1A.230905.019 am: 2b8cabe73b -s ours
am skip reason: Merged-In I421c13e65efa565753337dc21e6520682e726e81 with SHA-1 f0c772199b is already in history

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

Change-Id: I029dc4c90774c1ce20277cc5d4a99bc1cda8e5b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:28 +00:00
Xin Li
71f31d7f37 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:35:55 +00:00
Emilian Peev
bd4cdc6a9a Camera VTS: Wait for camera provider to become active
Use "AServiceManager_waitForService" instead of
"AServiceManager_getService" to wait for any camera
providers that might be using the lazy mechanism and
are not running all the time.

Bug: 297965980
Test: atest VtsAidlHalCameraProvider_TargetTest

Change-Id: I6374dc768cd1068885668f927f902dcee44a7a42
2023-09-05 18:18:49 +00:00
Istvan Nador
2a5a4acdbc Enable the keymaster logger in the default Keymint am: 8f28f8b8ea am: 6d3ce4954e am: 7fd1d07ac1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2738433

Change-Id: I06d9820028b67c6dadf945ad7e5de3286075121a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 18:15:15 +00:00
Istvan Nador
7fd1d07ac1 Enable the keymaster logger in the default Keymint am: 8f28f8b8ea am: 6d3ce4954e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2738433

Change-Id: I1b6959fd18483bc01cec906a9247f38e6f3ce0ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 17:00:30 +00:00
Istvan Nador
6d3ce4954e Enable the keymaster logger in the default Keymint am: 8f28f8b8ea
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2738433

Change-Id: I4ed1aad6a176685e53492e5f8eaaac98c4975e95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 16:10:25 +00:00
Istvan Nador
8f28f8b8ea Enable the keymaster logger in the default Keymint
This solution was adopted from Cuttlefish's host side Keymint
implementation: I22bde00aed311c6774f83acc08a2c21e6e75141f.

Bug: 296983430
Test: Tested with Cuttlefish that the logs are present in logcat.
Change-Id: I942b0200bb164a2a865b255c6f26d628cbd345a4
2023-09-04 12:05:58 +00:00
David Drysdale
1d5b2daffe Summarize security HALs
Test: nope
Change-Id: Ie222c457a7637aa41bafbdb6c875624fbb82a397
2023-09-04 13:04:45 +01:00
Treehugger Robot
8459ae0f28 Merge "Move CDDL into separate CDDL files" into main am: f9e524c5b1 am: 76c929f01e am: 2402a65e30
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727995

Change-Id: If21781616efb7a7b2b9708c3fbeeb4cbe5d2e5dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-02 00:54:22 +00:00
Treehugger Robot
2402a65e30 Merge "Move CDDL into separate CDDL files" into main am: f9e524c5b1 am: 76c929f01e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727995

Change-Id: I2fe1a8dd057853f3dd642a3e47cfcc6e4beeb77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-02 00:05:00 +00:00
Devin Moore
6ea114dcd0 Remove compatibility_matrix.9.xml from 'next' builds
This compatibility matrix has not be finalized or released yet, so it's
very important that releasing devices in the 'next' configuration don't
use its contents.

Test: m
Bug: 296930312
Change-Id: I843a24308a1653bff0b4842ff71e657304bea2c8
Merged-In: I843a24308a1653bff0b4842ff71e657304bea2c8
2023-09-02 00:04:29 +00:00
Devin Moore
9c8fc4b81d Mark some HALs as updatable-via-apex retroactively
These are all marked updatable-via-apex in compatibility_matrix.9.xml.
Adding them to compatibility_matrix.8.xml to allow Cuttlefish to build
with the apexes on 'next'

Test: m
Bug: 296930312
Change-Id: I2910695dbb7a79ca7164f7ed69437f9636d4135b
Merged-In: I2910695dbb7a79ca7164f7ed69437f9636d4135b
2023-09-02 00:04:14 +00:00
Treehugger Robot
87c5f5e72b Merge "Use the PDL library for HCI packets" into main am: ab10c92241 am: ccb7204ecf am: b8d55edb46
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2675951

Change-Id: I5edcb3c7379d48ca562aeabe4adbc1515a6be40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 23:12:37 +00:00
Andrew Scull
3d96fada28 Merge "Test the format of patch level device info" into main am: 92bd93934a am: f8d5b437b1 am: ec93170857
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2736075

Change-Id: I89e2d23a91231d89a42c9f29a2add198b7fc56ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 23:11:58 +00:00
Treehugger Robot
76c929f01e Merge "Move CDDL into separate CDDL files" into main am: f9e524c5b1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727995

Change-Id: Iedd1e8b48ba470d4c16d4306e0f9dc05008b25d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 23:08:44 +00:00
Treehugger Robot
b8d55edb46 Merge "Use the PDL library for HCI packets" into main am: ab10c92241 am: ccb7204ecf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2675951

Change-Id: I67b65e93a6a83ccb877ad3da8fb58879342141d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 22:23:35 +00:00
Andrew Scull
ec93170857 Merge "Test the format of patch level device info" into main am: 92bd93934a am: f8d5b437b1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2736075

Change-Id: I6b1745db60e300d9aa0b6ce0c4ca6c4a3020a1e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 22:22:58 +00:00
Treehugger Robot
f9e524c5b1 Merge "Move CDDL into separate CDDL files" into main 2023-09-01 22:20:54 +00:00
Treehugger Robot
ccb7204ecf Merge "Use the PDL library for HCI packets" into main am: ab10c92241
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2675951

Change-Id: I7cfe73d0dbe9443a4dc04db615dd1e7e7c95fc15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 21:31:03 +00:00
Andrew Scull
f8d5b437b1 Merge "Test the format of patch level device info" into main am: 92bd93934a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2736075

Change-Id: I0901620654d311c76880dd3856ef55bf7ae17cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 21:28:37 +00:00
Treehugger Robot
ab10c92241 Merge "Use the PDL library for HCI packets" into main 2023-09-01 21:01:49 +00:00