Commit graph

65799 commits

Author SHA1 Message Date
Cody Schuffelen
1e3f885162 Merge "C++ AIDL on-device GateKeeper / SharedSecret impl" into main am: e23e450487 am: e6273eff1d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3023986

Change-Id: I6bda0795988c354187e4b4903be553cc42a780d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-14 22:44:43 +00:00
Cody Schuffelen
e6273eff1d Merge "C++ AIDL on-device GateKeeper / SharedSecret impl" into main am: e23e450487
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3023986

Change-Id: I6532238eb92f6000366df38c87b170e623d72a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-14 22:26:59 +00:00
Cody Schuffelen
e23e450487 Merge "C++ AIDL on-device GateKeeper / SharedSecret impl" into main 2024-04-14 22:08:37 +00:00
Bruno Carneiro
2bb20ba418 Improve OpenAfterOpen VTS test am: 056aa140ca am: bdf398486d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3040299

Change-Id: I12f11588ca383c4b21baee55c031135f3154bfa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 22:09:50 +00:00
Bruno Carneiro
bdf398486d Improve OpenAfterOpen VTS test am: 056aa140ca
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3040299

Change-Id: I1ba8e032c62f3e5b21844f776ea0fc918d2f2529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 21:40:08 +00:00
Bruno Carneiro
056aa140ca Improve OpenAfterOpen VTS test
A callback should be executed every time the NFC interface is opened,
even in OpenAfterOpen scenarios. If a callback is not executed, a
crash may occur where the NfcService hangs while waiting for an
OPEN_CPLT event.

Change-Id: Idd78c0dae944e3d39a6828b43db5a608adbaf1d9
Signed-off-by: Bruno Carneiro <bccunha@motorola.com>
2024-04-12 14:43:22 -03:00
A. Cody Schuffelen
097e625335 C++ AIDL on-device GateKeeper / SharedSecret impl
Because Keystore2 always requires valid auth tokens for user keys, this
copies and extends the existing in-guest GateKeeper implementation to
negotiate a shared secret key with Keymint in order to generate a
session key for signing auth tokens.

This implementation also uses AIDL rather than HIDL to interact with the
framework. It's also packaged in an APEX.

The files are cobbled together from a few sources:

- SoftGateKeeper.h is based on hardware/interfaces/gatekeeper/1.0/software/SoftGateKeeper.h
- GateKeeper.{cpp,h} are based on device/google/cuttlefish/guest/hals/gatekeeper/remote/remote_gatekeeper.{cpp,h}
- SharedSecret.{cpp,h} are based on device/google/cuttlefish/guest/hals/keymint/remote/remote_shared_secret.{cpp,h}
- Apex files are based on device/google/cuttlefish/guest/hals/keymint/rust/

Keymint modifications to use BOOT_TIME are lifted from

https://android-review.git.corp.google.com/c/platform/hardware/interfaces/+/2856649/6..8/security/keymint/aidl/default/ta/clock.rs#38

Bug: 332376454
Change-Id: I81845d5e6370bdddb1a24d67437964e03a5fb243
Test: Run with rust-nonsecure keymint on Cuttlefish
2024-04-11 13:53:32 -07:00
Treehugger Robot
429baea512 Merge "PresetReverb: Add test to validate PresetReverb Effect" into main am: 0f141d1967 am: bdb87cf0ce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3029145

Change-Id: I253596a95ee4a6dbac2a37299d73b797d82ce70f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:52:14 +00:00
Treehugger Robot
afa170792a Merge "Bluetooth vts hal: Restore to 2s startup" into main am: a6c9097dd0 am: 094dfcfacf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3037779

Change-Id: I8ee86ec75bacb734bea62c55d03814f30c6b9a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:51:49 +00:00
Treehugger Robot
f987ba014d Merge "Camera:Update condition to validate flash keys." into main 2024-04-11 17:46:35 +00:00
Treehugger Robot
bdb87cf0ce Merge "PresetReverb: Add test to validate PresetReverb Effect" into main am: 0f141d1967
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3029145

Change-Id: Ib0fcf6e703c83f1c09e887dfd411a2f45a78d0ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:37:48 +00:00
Treehugger Robot
094dfcfacf Merge "Bluetooth vts hal: Restore to 2s startup" into main am: a6c9097dd0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3037779

Change-Id: Icf2a60fd56912893557dd559aa243713cb799a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:35:31 +00:00
Treehugger Robot
0f141d1967 Merge "PresetReverb: Add test to validate PresetReverb Effect" into main 2024-04-11 17:25:34 +00:00
Treehugger Robot
a6c9097dd0 Merge "Bluetooth vts hal: Restore to 2s startup" into main 2024-04-11 17:21:34 +00:00
Rucha Katakwar
c0355fdb39 Camera:Update condition to validate flash keys.
Bug: 332613252
Test: Tested locally on a pixel device.
Change-Id: Ic95dd58288cd8e93e29ebb2259c1f783a589898f
2024-04-11 09:35:57 -07:00
William Escande
ac0f34f6cd Bluetooth vts hal: Restore to 2s startup
1s should really be the max limit, but it requires time to investigate
the failures and optimize this

Bug: 327273567
Fix: 332815453
Test: atest VtsHalBluetoothTargetTest
Change-Id: I43767b5241d967cb643401711fd7b2e015e99455
2024-04-11 09:06:31 -07:00
Jeff Pu
d58473668d Merge "Add biometric virtual HAL tests to presubmit Bug: 333743980 Test: atest --test-mapping" into main 2024-04-11 15:40:53 +00:00
Jeff Pu
c2f76afc4c Add biometric virtual HAL tests to presubmit
Bug: 333743980
Test: atest --test-mapping

Change-Id: I4efc51473194ee431ee8ca4bb2c8a5dfb629ad87
2024-04-11 13:35:47 +00:00
Treehugger Robot
cc28ee3d6a Merge "Allow vendor ISharedSecret HALs by any name" into main am: 776e39b725 am: 35c50c21e2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3038254

Change-Id: I9c6176035e2d96d6e853715a393f626367393e87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 10:10:16 +00:00
Treehugger Robot
35c50c21e2 Merge "Allow vendor ISharedSecret HALs by any name" into main am: 776e39b725
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3038254

Change-Id: I9bd960e6fa72912bc32cb2bde26aff589dd017b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 09:54:14 +00:00
Lais Andrade
4ca32818b3 Merge "Fix flaky VTS for vibration completion callback" into main 2024-04-11 09:47:03 +00:00
Treehugger Robot
776e39b725 Merge "Allow vendor ISharedSecret HALs by any name" into main 2024-04-11 09:36:52 +00:00
Treehugger Robot
ecdd641b0f Merge "[Thread] make sure buffer size is enough" into main am: 82bb6fcfdc am: fad8a7b6d0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3039092

Change-Id: I549ffb080560c5385c36111f72f6a7314a088971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 08:53:10 +00:00
Treehugger Robot
fad8a7b6d0 Merge "[Thread] make sure buffer size is enough" into main am: 82bb6fcfdc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3039092

Change-Id: Ie1372d5e4f7152426fdb9a6619617ac2d67e5895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 08:33:14 +00:00
Treehugger Robot
82bb6fcfdc Merge "[Thread] make sure buffer size is enough" into main 2024-04-11 08:18:51 +00:00
Mikhail Naganov
1676108800 audio: Use allow list for device connection types in TryConnectMissingDevice am: 7b9b9e03e5 am: 30cf023827
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3038652

Change-Id: I293c710b7bab3f5ab5d09022abe2f821210eba23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 07:53:03 +00:00
Mikhail Naganov
30cf023827 audio: Use allow list for device connection types in TryConnectMissingDevice am: 7b9b9e03e5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3038652

Change-Id: I304b1d7bb2d42151aa24d9c16387e4f2bfc14711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 07:36:49 +00:00
shihchienc
cb8a9d74a0 [Thread] make sure buffer size is enough
inotify event size is dynamic, we need to make sure read would not
return error when having inotify event.

Bug: 333829392
Test: manual check `Invalid argument` error won't happen
Change-Id: I3cac8d1519659c6b1b53c1d41013818adab876c7
2024-04-11 06:20:38 +00:00
Sneha Patil
94abce0998 PresetReverb: Add test to validate PresetReverb Effect
Added tests to verify increase in energy with decrease in room and hall size.
Remove preset reverb default implementation from the config file.

Bug: 305866207
Test: atest VtsHalPresetReverbTargetTest
Change-Id: I565612d90b7c7e52cb23bd5dbfaf02235f65cc67
2024-04-11 09:25:56 +05:30
Mikhail Naganov
7b9b9e03e5 audio: Use allow list for device connection types in TryConnectMissingDevice
Limit the connection types to test to the following:
 - HDMI*
 - IP_V4
 - USB

Only these connection types can be easily checked by the HAL
for presence of an external device.

Bug: 326888643
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I659e14a150b3043ead8d844cd89a2c4700d57efd
2024-04-10 23:50:37 +00:00
Rucha Katakwar
0cea523ba3 Camera: Close session after validating flash keys
Bug: 333353956
Test: Tested on a pixel device
Change-Id: Ic48ec93cc579579fa7a39b66d0dc4cf0a7c11531
2024-04-10 14:28:08 -07:00
A. Cody Schuffelen
f693f3bc5c Allow vendor ISharedSecret HALs by any name
This works together with the keystore2 implementation which already
scans the device for implementations by any name.

Relevant code that searches for "shared secret participants":

https://cs.android.com/android/platform/superproject/main/+/main:system/security/keystore2/src/shared_secret_negotiation.rs;l=142;drc=f20c0ddd095013f983d0f73aee0285331bfae4e3

Bug: 332376454
Test: Run cuttlefish
Change-Id: I5eef81e5f55aaa327cabb5c648e085229b8ce6db
2024-04-10 12:59:00 -07:00
Lais Andrade
c689ba5ed2 Fix flaky VTS for vibration completion callback
Update assertions on vibration completion callback to use a fixed
timeout of 100ms. Tests are flaky on cuttlefish, which indicates it's
not hardware latency causing it.

Fix: 333639794
Test: atest VtsHalVibratorTargetTest
Change-Id: I986cdd8087895fc0694d689e70feef0a9fe4140e
2024-04-10 11:07:11 +01:00
Orlando Arbildo
be4a431af6 Add key parameter to deriveDicePolicyBoundKey am: 287187f1d2 am: adafb4ab7d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3026286

Change-Id: I968b034688d5c36180ec10fe9265cbea1dc3f383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 00:39:05 +00:00
Orlando Arbildo
adafb4ab7d Add key parameter to deriveDicePolicyBoundKey am: 287187f1d2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3026286

Change-Id: Ib5435187819049e7718a462a80974b2cb763f161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 00:22:32 +00:00
Orlando Arbildo
287187f1d2 Add key parameter to deriveDicePolicyBoundKey
Adding a key parameter to deriveDicePolicyBoundKey to use it
as the base of the derived key.

Bug: 284152719
Test: qemu android build
Change-Id: Iab3ee341825f01345996bde3b0b62037e4ec45da
2024-04-09 22:53:21 +00:00
Shrikar Amirisetty
8b2347c1e8 Merge "Updated _LOCK properties HAL docs with explanation of property values" into main 2024-04-09 22:19:25 +00:00
shrikar
af790073c7 Updated _LOCK properties HAL docs with explanation of property values
Excluding MIRROR_LOCK, will address in later CL

Bug: 316945499
Bug: 316945779
Test: presubmit
Change-Id: I973553144956a6b5225562418912e1116ce2359c
2024-04-09 19:21:48 +00:00
Seth Moore
923e2a6183 Merge "Allow RKP-only devices to pass keymint VTS" into main am: fae563acb0 am: dc2d3dfbdb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3029929

Change-Id: Iec1433c892be25669adf00a75a7c86ccffbd32d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 16:14:35 +00:00
Seth Moore
dc2d3dfbdb Merge "Allow RKP-only devices to pass keymint VTS" into main am: fae563acb0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3029929

Change-Id: If866510ba314e96fc359281f97fbb672feef4720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 15:58:15 +00:00
Seth Moore
fae563acb0 Merge "Allow RKP-only devices to pass keymint VTS" into main 2024-04-09 15:31:26 +00:00
David Drysdale
589f7ac4d5 Merge "Make batch attestation keys/certs optional" into main am: 61c9ab4d87 am: 9985cdb9e1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3002898

Change-Id: I91627fad20c36b111714ac20739b3dec8ad540f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 09:34:00 +00:00
David Drysdale
9985cdb9e1 Merge "Make batch attestation keys/certs optional" into main am: 61c9ab4d87
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3002898

Change-Id: Id9c5746dade9ced9006e4b6a9b4aca1635dc9c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 09:27:39 +00:00
David Drysdale
61c9ab4d87 Merge "Make batch attestation keys/certs optional" into main 2024-04-09 09:11:54 +00:00
Automerger Merge Worker
43696aae61 Merge "Merge "[threadnetwork] update the platform log API usages and implementations" into main am: f02c7e0b2f am: ce3ffbc5a2" into main 2024-04-09 07:19:22 +00:00
Treehugger Robot
df771ac3cd Merge "[threadnetwork] update the platform log API usages and implementations" into main am: f02c7e0b2f am: ce3ffbc5a2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3029147

Change-Id: I3c5ae7214855fc6036f519514b4546d09582ab3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 07:19:07 +00:00
Treehugger Robot
dc7398fa6f Merge "[threadnetwork] update the platform log API usages and implementations" into main am: f02c7e0b2f am: ce3ffbc5a2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3029147

Change-Id: Id6b7874cb4a7b82a52887da567ac028f315d9dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 07:19:06 +00:00
Treehugger Robot
ce3ffbc5a2 Merge "[threadnetwork] update the platform log API usages and implementations" into main am: f02c7e0b2f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3029147

Change-Id: Ibde625fd05767f311c13d280d2e3795813b0712c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 06:59:31 +00:00
Treehugger Robot
f02c7e0b2f Merge "[threadnetwork] update the platform log API usages and implementations" into main 2024-04-09 06:38:44 +00:00
Kiyoung Kim
66f3461e05 [automerger skipped] Merge "Remove VNDK definition(s)" into main am: 160c3d610c am: 09cf45025e -s ours
am skip reason: Merged-In Ic4f19113c1a25dc1fb60cdfbf9c0f2d8d7d09726 with SHA-1 09639b93ba is already in history

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

Change-Id: I29aa220680690ea59b178e42eb3be90f449770f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 02:21:35 +00:00