Commit Graph

37390 Commits

Author SHA1 Message Date
Kelvin Zhang
b66d2a08f0 Add a wrapper for callers of BootControl HAL
We are switching BootControl from HIDL to AIDL. All clients must be
compatible with both implementations. To ease implementation, create a
wrapper that will use AIDL if possible, and fallback to HIDL otherwise.

Test: th
Bug: 227536004
Change-Id: Ia40cb384058a0052f7c5c39766534c23a095ca59
2022-06-17 10:22:17 -07:00
Jonathan Reichert
309f54042f Merge "To skip VtsHalBootV1_1TargetTest for non Virtual A/B devices" 2022-06-17 08:17:22 +00:00
David Drysdale
11cb564913 Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" 2022-06-17 06:05:13 +00:00
Shawn Willden
35db349596 Read VSR level from correct property.
Bug: 235424890
Test: VtsHalKeymasterV4_0TargetTest & VtsAidlKeyMintTargetTest
Change-Id: I39109c097d129124097a303c3f108d015cb367e3
2022-06-17 10:49:29 +09:00
Kelvin Zhang
3db22b8196 Merge "Implement bootctrl aidl" 2022-06-17 00:43:58 +00:00
David Drysdale
d407b64096 [automerger skipped] [conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into android12-tests-dev am: bbecb4563f am: 3803a10f9b -s ours
am skip reason: skipped by user drysdale

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

Change-Id: Iad07e7216651b427bd405f2a5510ba0b8c78b88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:58:17 +00:00
Xin Li
1af1b08868 Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:54 +00:00
Treehugger Robot
ce30f4b18c Merge "Specify correct assignee for bugs." 2022-06-16 16:39:20 +00:00
Gabriel Biren
7b27d7bcc6 Merge changes I9e06f025,I413c3803
* changes:
  Update supplicant AIDL VTS tests to use the new version of stopWifiFramework().
  In supplicant VTS test setup, make sure that the wifi hal is stopped before starting wifi.
2022-06-16 16:03:15 +00:00
David Drysdale
3803a10f9b [conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into android12-tests-dev am: bbecb4563f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2117528

Change-Id: I7d5a6e121c3dc1a73382713ef4af9d6ae08ae887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 10:07:17 +00:00
David Drysdale
bbecb4563f Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into android12-tests-dev 2022-06-16 09:46:37 +00:00
Michael Butler
bc24c9b37a Merge "Disable TEST_MAPPING for VtsHalNeuralnetworksV1_*TargetTest" 2022-06-15 23:47:08 +00:00
Kelvin Zhang
121bec542e Implement bootctrl aidl
There's already a libboot_control, which provides implementation for
bootcontrol HAL. Implement AIDL bootctrl server by wrapping
libboot_control

Test: th
Bug: 227536004
Change-Id: Ia54f91f7fd17b6e86956e458cdf0c36c31624dbc
2022-06-15 09:51:02 -07:00
Treehugger Robot
ddc1e4c82d Merge "Add a README for Remote Key Provisioning." 2022-06-15 13:32:46 +00:00
Max Bires
82ed7a42c0 Add a README for Remote Key Provisioning.
This document goes a little more in depth on the motivating factors and
background mechanisms that occur with RKP, that are not appropriate for
direct inclusion in the HAL docs in the .aidl files.

Fixes: 234159998
Test: Readable
Merged-In: I141fb098c536a5468b1113af64dcf6185ea7ae9f
Change-Id: I141fb098c536a5468b1113af64dcf6185ea7ae9f
2022-06-15 05:29:22 -07:00
Gabriel Biren
99bb148510 Update supplicant AIDL VTS tests to use the new
version of stopWifiFramework().

Bug: 234853504
Test: atest VtsHalWifiSupplicantStaIfaceTargetTest \
            VtsHalWifiSupplicantStaNetworkTargetTest \
	    VtsHalWifiSupplicantP2pIfaceTargetTest # AIDL service
Change-Id: I9e06f025a5b6b44d6a6caf8362c64bd5a546e1ac
2022-06-15 00:04:50 +00:00
Gabriel Biren
bfe60cda4d In supplicant VTS test setup, make sure that the
wifi hal is stopped before starting wifi.

Bug: 234853504
Test: atest VtsHalWifiSupplicantV1_0TargetTest # HIDL service
Change-Id: I413c3803a6607a72cc3aa8a5fa208551be1b1032
2022-06-15 00:01:29 +00:00
Xin Li
7fc936fd7f Merge Android 12 QPR 3
Bug: 236045730
Merged-In: I8564456248d0b01eb521d575ef540689c8035d3d
Change-Id: I56da73431668a2a7dc5f23dfbcdf90622c222770
2022-06-14 16:48:12 -07:00
Sivananthinikumari
b2018887d7 To skip VtsHalBootV1_1TargetTest for non Virtual A/B devices
Snapshot specific testcases are skipped if Virtual A/B is disabled on R launch devices.

Bug: 234812188
Change-Id: I9aa17b681c6880e66fd2976e0c9d3cddc6ba2884
2022-06-14 07:27:52 +00:00
David Drysdale
4348927562 KeyMint VTS: cope with ATTEST_KEY +/- SIGN
This change syncs aosp/master with the change in http://aosp/2117528,
allowing devices that launched with the (incorrect) version of
ATTEST_KEY VTS tests in Android S to continue to pass the test.

Bug: 197096139
Bug: 230074335
Test: VtsAidlKeyMintTargetTest
Change-Id: If88642e238e64ca9ec80303a4a72f7171c63464f
2022-06-13 10:12:12 +01:00
Treehugger Robot
50e113f80c Merge "Update owners for hardware/interfaces." am: 19410a1fc3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2116014

Change-Id: I8564456248d0b01eb521d575ef540689c8035d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 22:46:11 +00:00
Treehugger Robot
19410a1fc3 Merge "Update owners for hardware/interfaces." 2022-06-09 22:23:14 +00:00
Shawn Willden
460ef388c7 Specify correct assignee for bugs.
Test: N/A, comment-only change
Change-Id: I78b32693531180f7377651edd0dab93cd2cfd870
2022-06-09 06:36:54 -06:00
David Drysdale
abe4c2ec93 Merge "KeyMint VTS: check chain size before dereferencing" am: 543eb71cb6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2119365

Change-Id: I152a985c82abfc838a691d3bf09ddea59815f642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 05:46:50 +00:00
David Drysdale
543eb71cb6 Merge "KeyMint VTS: check chain size before dereferencing" 2022-06-09 05:27:00 +00:00
Treehugger Robot
59a552857a [automerger skipped] Merge changes from topic "226452499" into android12-tests-dev am: 970cccb939 am: 94755b9007 -s ours am: 7dafb3d92e -s ours
am skip reason: Merged-In I5ef42c922a0b0a037d2cf70ca83790fc95196ccb with SHA-1 cf52cb0307 is already in history

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

Change-Id: I78bc01547c5ca149de088048406282cecf04cad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 21:04:03 +00:00
Karthik Ramakrishnan
4830b66fa7 [automerger skipped] VtsHalBluetoothV1_0: Turn off/on BT for all users am: 94a3a178aa -s ours am: 5adad834a9 -s ours am: fc6dc14209 -s ours
am skip reason: Merged-In Ica83f4959a87b8fb498b535572738e4e790c6ddb with SHA-1 0dc66a2c69 is already in history

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

Change-Id: Ie8871c6bbfff344d13c240a6a1d5d4ef49eefd9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 21:04:02 +00:00
Bob Badour
f582e4c00e [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces am: 829f72e358
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2120232

Change-Id: I8db525d77ac3002d6bbbcdef317eb0ab2ea38eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 21:03:55 +00:00
Treehugger Robot
7dafb3d92e [automerger skipped] Merge changes from topic "226452499" into android12-tests-dev am: 970cccb939 am: 94755b9007 -s ours
am skip reason: Merged-In I5ef42c922a0b0a037d2cf70ca83790fc95196ccb with SHA-1 cf52cb0307 is already in history

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

Change-Id: I94821cbe35b9f5ba47b196134c3eb9a2b806ff5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 20:47:59 +00:00
Karthik Ramakrishnan
fc6dc14209 [automerger skipped] VtsHalBluetoothV1_0: Turn off/on BT for all users am: 94a3a178aa -s ours am: 5adad834a9 -s ours
am skip reason: Merged-In Ica83f4959a87b8fb498b535572738e4e790c6ddb with SHA-1 0dc66a2c69 is already in history

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

Change-Id: I0cac368bbc67d96e276a2454e1b10c7c910ddc39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 20:47:57 +00:00
Treehugger Robot
94755b9007 Merge changes from topic "226452499" into android12-tests-dev am: 970cccb939
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2099117

Change-Id: I00253cc0bcd6158dc24de0f183ca07f711b1db00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 20:31:52 +00:00
Karthik Ramakrishnan
5adad834a9 [automerger skipped] VtsHalBluetoothV1_0: Turn off/on BT for all users am: 94a3a178aa -s ours
am skip reason: Merged-In Ica83f4959a87b8fb498b535572738e4e790c6ddb with SHA-1 0dc66a2c69 is already in history

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

Change-Id: I1d91810834810314b06dfb14db753af520dac0f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 20:31:50 +00:00
Treehugger Robot
970cccb939 Merge changes from topic "226452499" into android12-tests-dev
* changes:
  VtsHalBluetoothV1_1: Turn off/on BT at RunCommandTargetPreparer
  VtsHalBluetoothV1_0: Turn off/on BT for all users
2022-06-08 20:07:23 +00:00
Michael Butler
e8e7a1018c Disable TEST_MAPPING for VtsHalNeuralnetworksV1_*TargetTest
A sibling change removes the NN HIDL sample drivers from cuttlefish. In
response, this change removes the VtsHalNeuralnetworksV1_*TargetTest
tests from the TEST_MAPPING because they do not test anything without
the NN HIDL sample drivers present.

Note that the NN AIDL sample drivers and NN AIDL VTS test
(VtsHalNeuralnetworksTargetTest) are still present.

Bug: 233665601
Test: mma
Test: croot && cd hardware/interfaces/neuralnetworks && atest
Change-Id: I90bccd843ba9296c27d3010cec652be55a13a225
2022-06-08 10:47:22 -07:00
Bob Badour
829f72e358 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  boot/aidl/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I2166ff89ef6a370312f902d3d534e11b4006da16
2022-06-08 10:09:09 -07:00
Treehugger Robot
fa0ac0f30c Merge "vibrator: turn off vibrator after testing ChangeVibrationAmplitude" am: 05eb1a279b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2104024

Change-Id: I016a1e46736fc84a024b379e369cdee044e0b57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 14:27:16 +00:00
David Drysdale
69fface7a9 [automerger skipped] Specify KeyMint EC keys by curve not size am: bd3d12a377 am: 09afca29d3 -s ours am: 0526ce5a58 -s ours
am skip reason: Merged-In Ia6b7d86a387cfc06db05e4ba6ff8f331e9c6345f with SHA-1 915ce253a8 is already in history

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

Change-Id: I34c02216ed26539fdaae2c6fd541252f803f7272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 14:27:02 +00:00
Treehugger Robot
05eb1a279b Merge "vibrator: turn off vibrator after testing ChangeVibrationAmplitude" 2022-06-08 13:48:44 +00:00
David Drysdale
0526ce5a58 [automerger skipped] Specify KeyMint EC keys by curve not size am: bd3d12a377 am: 09afca29d3 -s ours
am skip reason: Merged-In Ia6b7d86a387cfc06db05e4ba6ff8f331e9c6345f with SHA-1 915ce253a8 is already in history

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

Change-Id: I77aca69512167b855d0e037ca7d25d1052d26faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 13:46:18 +00:00
David Drysdale
09afca29d3 Specify KeyMint EC keys by curve not size am: bd3d12a377
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2102924

Change-Id: I06027489aca2b079ce0581cb71d8a43679384401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 13:36:16 +00:00
David Drysdale
a8a888ecf7 KeyMint VTS: check chain size before dereferencing
Test: VtsAidlKeyMintTargetTest
Change-Id: Id5ded31e1120e501dc5eb90b78cad1190a4c3042
2022-06-08 12:44:42 +01:00
Kelvin Zhang
4a77acb781 Add AIDL definitions for IBootControl am: c056242bdf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2050941

Change-Id: Iba87ed9afe7fe7ab7bfe526cfa0cecc28761beb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 09:58:22 +00:00
Kelvin Zhang
c056242bdf Add AIDL definitions for IBootControl
Test: th
Bug: 227536004

Change-Id: Ic27f41e640927639bf5b901c2b592224f9d8308b
2022-06-06 16:09:03 -07:00
Shawn Willden
8329536c7c Implement KeyMint2 test for VSR13 am: 22fb9c16fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2115214

Change-Id: Ie932781b1e8c2f9a8410d491202c5b4c92303445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 18:25:38 +00:00
David Drysdale
ead5f3e7a5 KeyMint VTS: cope with ATTEST_KEY +/- SIGN
This change is a back-port of http://aosp/1877245 but adapted to allow
for devices that passed the original (but incorrect) version of the VTS
tests.

Bug: 197096139
Bug: 230074335
Test: VtsAidlKeyMintTargetTest
Change-Id: I447e6dc9dc049922725160c48c2406d79a8cffb5
2022-06-06 18:23:04 +01:00
Shawn Willden
22fb9c16fc Implement KeyMint2 test for VSR13
Test: VtsAidlKeyMintTargetTest & VtsHalKeymasterV4_0TargetTest
Change-Id: Ie10b705bb06990a2a2c6223fcce28f5fde6bf3f3
2022-06-06 09:10:17 -06:00
Selim Gurun
75d67ca355 Update owners for hardware/interfaces.
evs and vehicle owners are already good, so did not touch.

Test: echo 'in TH we trust!'
Bug: yes, it bugs me

Change-Id: I6168956f7e21488f5fa6c4f0019c0885d074ba0e
2022-06-04 01:43:52 +00:00
Treehugger Robot
9b3075bff9 Merge "Implement alternate SE RoT provisioning" am: f1a7cc01ea
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032527

Change-Id: Ic68a3bc11740a705acae579233cf4ed714be6839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 09:15:47 +00:00
Treehugger Robot
f1a7cc01ea Merge "Implement alternate SE RoT provisioning" 2022-06-01 08:47:51 +00:00
David Drysdale
e3c13e64e3 Merge "Add EncryptionOperationsTest.AesCbcZeroInputSuccess" am: 5adaa1e899
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2111604

Change-Id: I60506d8504ee919317edbc7f1094d9466d0b5698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 05:53:07 +00:00