Commit graph

34349 commits

Author SHA1 Message Date
David Drysdale
0a3c90f904 Merge "KeyMint: new version number in attestation" am: 17393cbb40
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918628

Change-Id: I4ba9a58363ff940f3db7d7dae2e8b5444268535e
2021-12-16 10:44:11 +00:00
David Drysdale
17393cbb40 Merge "KeyMint: new version number in attestation" 2021-12-16 09:37:15 +00:00
Treehugger Robot
1d5af3f5ec Merge "Add android.hardware.security.dice HAL interface." am: b05a7c1376
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1883260

Change-Id: Ic66d56193c0b4514935537f2f6695968db82feaf
2021-12-16 00:43:52 +00:00
Treehugger Robot
b05a7c1376 Merge "Add android.hardware.security.dice HAL interface." 2021-12-16 00:16:45 +00:00
Gabriel Biren
dc3be74728 Merge "Add Wifi HAL supplicant AIDL interface definitions." am: a798cf2c63
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1916957

Change-Id: I4d745a872ec068f7fb4f1ddc76a95dfc89c5ed43
2021-12-15 21:35:42 +00:00
Gabriel Biren
a798cf2c63 Merge "Add Wifi HAL supplicant AIDL interface definitions." 2021-12-15 21:13:41 +00:00
Janis Danisevskis
c3cc5a0b21 Add android.hardware.security.dice HAL interface.
The dice HAL provides access to the Dice artifacts of the running Android
instance.

Bug: 198197213
Test: VTS test comming in two ...
Change-Id: I6e84f9a9c7153e7a96c06d1d451e658b3f222586
2021-12-15 08:52:07 -08:00
David Drysdale
7dff4fc9b7 KeyMint: new version number in attestation
For the time being, allow the version number in the attestation record
to be 100 even if the AIDL version is 2, so that implementations don't
have to update both versions simultaneously.

Bug: 194358913
Test: TreeHugger, VtsAidlKeyMintTargetTest
Change-Id: I9aae69327a62014e286ce30ca2a4d91c4c280714
2021-12-15 14:31:19 +00:00
David Drysdale
02c4ee0dca Merge "KeyMint VTS: ATTEST_KEY has no other purpose" am: a67b0441fe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1844276

Change-Id: I8fa3e22b87c28d83819610ea34b99890cfed4ecb
2021-12-15 06:40:44 +00:00
David Drysdale
a67b0441fe Merge "KeyMint VTS: ATTEST_KEY has no other purpose" 2021-12-15 06:25:35 +00:00
Gabriel Biren
28a4812752 Add Wifi HAL supplicant AIDL interface definitions.
Converted from android.hardware.wifi.supplicant@1.4 HIDL interface.

Bug: 196235436
Test: m android.hardware.wifi.supplicant-update-api
BYPASS_INCLUSIVE_LANGUAGE_REASON=HE refers to High Efficiency

Change-Id: I9872f297450457c347fb5fe8cf4005b01d3ab1f6
2021-12-14 23:45:07 +00:00
Xin Li
e40637adf0 [automerger skipped] Merge "Merge Android 12 QPR1" am: b16c246ddc -s ours
am skip reason: Merged-In I66e5209ddfba025f43ca0beb7067e6e0e29f9e46 with SHA-1 41aaa16fca is already in history

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

Change-Id: Ifa8f95bdef29597f3e0ebc12a28c11f8736eb120
2021-12-14 21:00:26 +00:00
Xin Li
b16c246ddc Merge "Merge Android 12 QPR1" 2021-12-14 20:25:22 +00:00
Seth Moore
07069c9e35 Merge "Revert^2 "KeyMint HAL: add curve 25519, bump version"" am: 0834ba697f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1920687

Change-Id: I06062f5b39fe9a2e229aa732b2bd63cf067c05da
2021-12-14 19:06:22 +00:00
Seth Moore
0834ba697f Merge "Revert^2 "KeyMint HAL: add curve 25519, bump version"" 2021-12-14 18:49:58 +00:00
Steven Moreland
dd39b5c9d0 Merge "CHECK -> CHECK_EQ copy pasta" am: a8138bfbf6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1921302

Change-Id: I1a2df79239155845652d5e062c7f74d97bca2ae7
2021-12-14 17:50:59 +00:00
Steven Moreland
a8138bfbf6 Merge "CHECK -> CHECK_EQ copy pasta" 2021-12-14 17:37:00 +00:00
Xin Li
f28c9c1699 Merge Android 12 QPR1
Bug: 210511427
Merged-In: I66e5209ddfba025f43ca0beb7067e6e0e29f9e46
Change-Id: Ie3a9dfd72939b5b876a25dfe87fb6d28314b08dc
2021-12-14 08:39:09 -08:00
Steven Moreland
ffb03995e6 CHECK -> CHECK_EQ copy pasta
Hey did I start this? We can take a little bit better errors. :)

Bug: N/A
Test: N/A
Change-Id: I0e96f7f49dae9968904333da9b8269694058c11c
2021-12-14 01:45:47 +00:00
Treehugger Robot
41aaa16fca Merge "Revert^2 "health: require AIDL HAL and deprecate HIDL HAL."" am: ac7e154391
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918954

Change-Id: I66e5209ddfba025f43ca0beb7067e6e0e29f9e46
2021-12-13 21:46:31 +00:00
Treehugger Robot
ac7e154391 Merge "Revert^2 "health: require AIDL HAL and deprecate HIDL HAL."" 2021-12-13 21:28:25 +00:00
Seth Moore
d79a0ec9ed Revert^2 "KeyMint HAL: add curve 25519, bump version"
e76045d7b0

Change-Id: Ia167fd45b6e590e34523810ee10118c5c141f538
2021-12-13 20:03:33 +00:00
David Drysdale
f121b2c2bb Merge "Revert "KeyMint HAL: add curve 25519, bump version"" am: 391a772300
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918632

Change-Id: Ib4dac4d42b75c971d91ccad16744da8f6f9622e3
2021-12-13 16:31:04 +00:00
David Drysdale
391a772300 Merge "Revert "KeyMint HAL: add curve 25519, bump version"" 2021-12-13 16:14:16 +00:00
Eran Messeri
309c32adb7 Merge "Keymint: Test that corrupting the signature for HMAC verification fails" am: 924613950c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1915101

Change-Id: Ie35fb7e130bbd0eab84ab5a67b1d9afba41f0130
2021-12-13 16:08:20 +00:00
David Drysdale
e76045d7b0 Revert "KeyMint HAL: add curve 25519, bump version"
Revert "Bump keystore2 AIDL API version 1->2"

Revert "Advertise support of KeyMint V2"

Revert submission 1900930-version-bump

Reason for revert: Broken build on sc-qpr1-dev-plus-aosp, b/210450339
Reverted Changes:
I42a9b854f:keystore2: cope with new curve25519 enum
I167d568d6:Bump keystore2 AIDL API version 1->2
I3a16d072e:Advertise support of KeyMint V2
Ibf2325329:KeyMint HAL: add curve 25519, bump version

Change-Id: I78d4b07c41aa6bfeb367b56a58deeac6adb6ec46
2021-12-13 16:01:21 +00:00
Eran Messeri
924613950c Merge "Keymint: Test that corrupting the signature for HMAC verification fails" 2021-12-13 15:51:33 +00:00
David Drysdale
5a63e3ea57 Merge "KeyMint HAL: add curve 25519, bump version" am: f21e1a5c4a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1900930

Change-Id: I21b806aea83eadfceb63308e7ec697ac5ae11a4c
2021-12-13 14:48:32 +00:00
David Drysdale
f21e1a5c4a Merge "KeyMint HAL: add curve 25519, bump version" 2021-12-13 14:25:22 +00:00
Treehugger Robot
b60680edf3 Merge "Improve getModemActivityInfo API" am: aa8c59bea2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895248

Change-Id: I8801ac7f54bd8e939870a81fee12e003285d1720
2021-12-13 03:54:35 +00:00
Treehugger Robot
aa8c59bea2 Merge "Improve getModemActivityInfo API" 2021-12-13 03:36:35 +00:00
Yifan Hong
e36f3492e9 Revert^2 "health: require AIDL HAL and deprecate HIDL HAL."
c223843fa7

Change-Id: I48d2bc41338dc3d5eb194c6f4e4602af407e3e56
2021-12-10 23:53:47 +00:00
David Gross
d90a3fdb5a Merge "FL7: Refine REVERSE specification" am: dd26914af7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1915765

Change-Id: I40a830417802f9230df06f86faf09f9ababd2dc4
2021-12-10 22:29:42 +00:00
David Gross
dd26914af7 Merge "FL7: Refine REVERSE specification" 2021-12-10 22:13:09 +00:00
Yifan Hong
e5f1c03414 Merge "Revert "health: require AIDL HAL and deprecate HIDL HAL."" am: 5ad3bb1f87
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918448

Change-Id: I0488ff4dc0e6d19c562ae6c771f7165886b3b683
2021-12-10 21:33:19 +00:00
Yifan Hong
5ad3bb1f87 Merge "Revert "health: require AIDL HAL and deprecate HIDL HAL."" 2021-12-10 21:11:24 +00:00
Yifan Hong
c223843fa7 Revert "health: require AIDL HAL and deprecate HIDL HAL."
Revert "Implement health AIDL HAL on cuttlefish."

Revert submission 1891478-health-aidl-cuttlefish

Reason for revert: break db845c build
Reverted Changes:
Ibd4dec0a2:health: require AIDL HAL and deprecate HIDL HAL.
Ic1c753b40:Implement health AIDL HAL on cuttlefish.

Fixes: 210084272

Change-Id: I5ad1bcb788598eb93053c85e5d56f49643ba9037
2021-12-10 20:53:30 +00:00
Treehugger Robot
756676341a Merge "Clean up: remove LE audio hardware offload in Bluetooth audio HAL 2.1" am: 297d2f1c44
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1917160

Change-Id: I33c06bb5e894936e0ec43ef8dc1cf5d596f23790
2021-12-10 07:44:04 +00:00
Treehugger Robot
297d2f1c44 Merge "Clean up: remove LE audio hardware offload in Bluetooth audio HAL 2.1" 2021-12-10 07:22:13 +00:00
Yifan Hong
c201a91c35 Merge "health: require AIDL HAL and deprecate HIDL HAL." am: 6327a1ac33
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1891478

Change-Id: I120efc8928356db9b1ce1846f3f042b01c8f6d43
2021-12-10 06:27:29 +00:00
Yifan Hong
6327a1ac33 Merge "health: require AIDL HAL and deprecate HIDL HAL." 2021-12-10 06:09:46 +00:00
Alice Kuo
6f765ce3e3 Clean up: remove LE audio hardware offload in Bluetooth audio HAL 2.1
LE audio offload plan to fully support on aidl or temporal HAL 2.2. Remove it in HAL 2.1 to make the compatible work easier

Bug: 197296692
Bug: 150670922
Test: HAL 2.1/2.2 work for A2DP software/hardware media, and LE audio
software media/voip call

Change-Id: Icc68bea357d2ee0427826e0c20888399662e9bcb
2021-12-10 05:35:52 +00:00
Gary Jian
2ea9241a0e Improve getModemActivityInfo API
Add optional fields to allow modem to report activity information
of different technologies

Bug: 202413770
Test: m android.hardware.radio.modem-update-api

Change-Id: I3bb76c030222868ce881487fb17692a476c5f846
2021-12-10 12:16:45 +08:00
David Drysdale
c069a75302 KeyMint HAL: add curve 25519, bump version
Marked as required for TRUSTED_ENVIRONMENT impls but not STRONGBOX.

Bump keymint HAL version 1->2 in defaults and in current compatibility
matrix.

Bug: 194358913
Test: build
Change-Id: Ibf2325329f0656a2d1fc416c2f9a74d505d0bf20
2021-12-09 14:07:51 -08:00
Jakub Pawłowski
0b32a54b2a Merge "Pass sink metadata to Bluetooth" am: cd9bb98da1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1907864

Change-Id: I0f0aed30f097476483623f70331f6745fff1b4e6
2021-12-09 20:58:04 +00:00
Jakub Pawłowski
cd9bb98da1 Merge "Pass sink metadata to Bluetooth" 2021-12-09 20:52:58 +00:00
Prashant Patil
dec9fdc81d Keymint: Test that corrupting the signature for HMAC verification fails
A VTS test case to verify HMAC signature verification fails if data or
signature is currupted.

Bug: 209452930
Test: run vts -m VtsAidlKeyMintTargetTest
Change-Id: I2177fd99cfab4ef4a347d50461db0d2e3ad8c612
2021-12-09 13:41:30 +00:00
Chengyou Ho
21af98f74c Merge "Weaver: modify default HAL for passing VTS" am: 2697d16c43
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1914892

Change-Id: Ib24f5aac6d5e1c323d289b32069ac96626489263
2021-12-09 04:16:13 +00:00
Chengyou Ho
2697d16c43 Merge "Weaver: modify default HAL for passing VTS" 2021-12-09 03:57:48 +00:00
David Gross
91a30c1cea FL7: Refine REVERSE specification
Test: N/A

Bug: 202280925

Change-Id: Iae1f177254023c750c701e6594a61f3958de538c
2021-12-08 16:55:51 -08:00