Commit Graph

35539 Commits

Author SHA1 Message Date
Etienne Ruffieux
113278b32e Merge "Renamed bluetooth apex name to com.android.bluetooth" am: c07fb30b8f am: 4f3ee26fcf am: 96e198affd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1924438

Change-Id: Ib1352fbf08ede327cec886bc136b7f5542d90050
2021-12-16 23:13:53 +00:00
David Drysdale
1cce1762fe Merge "KeyMint: new version number in attestation" am: 17393cbb40 am: 0a3c90f904 am: bb5882c6b3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918628

Change-Id: Ib930f22030769d965e1e0323cebfc4bf0344dcac
2021-12-16 22:58:36 +00:00
Treehugger Robot
f2e0353561 [automerger skipped] DO NOT MERGE Merge "Add android.hardware.security.dice HAL interface." am: b05a7c1376 am: 1d5af3f5ec am: e05c950a89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88ce72f8fb6610b22ad99180dc641bd6a5e4be87
2021-12-16 22:57:10 +00:00
Etienne Ruffieux
96e198affd Merge "Renamed bluetooth apex name to com.android.bluetooth" am: c07fb30b8f am: 4f3ee26fcf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1924438

Change-Id: Ie456b32669cbed8d7e0ee1d12db6f2f59f7db32f
2021-12-16 22:44:25 +00:00
David Drysdale
bb5882c6b3 Merge "KeyMint: new version number in attestation" am: 17393cbb40 am: 0a3c90f904
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918628

Change-Id: I7e648891e8621e2ff13d73ddae3cf50dc93109a9
2021-12-16 22:42:41 +00:00
Treehugger Robot
e05c950a89 DO NOT MERGE Merge "Add android.hardware.security.dice HAL interface." am: b05a7c1376 am: 1d5af3f5ec
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1883260

Change-Id: If3b724cc66bbc87aad86211c9e7e2f36719f2c33
2021-12-16 20:55:15 +00:00
Gabriel Biren
edfe1d1472 Merge "Add Wifi HAL supplicant AIDL interface definitions." am: a798cf2c63 am: dc3be74728 am: 7b93d69e16
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1916957

Change-Id: I62c90daf1822e00cc3b7a96f50eec09ec81559fd
2021-12-16 18:48:14 +00:00
Etienne Ruffieux
4f3ee26fcf Merge "Renamed bluetooth apex name to com.android.bluetooth" am: c07fb30b8f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1924438

Change-Id: I4a92dfcf1af677498edc3a7da033040c9d2742c2
2021-12-16 18:19:44 +00:00
Etienne Ruffieux
c07fb30b8f Merge "Renamed bluetooth apex name to com.android.bluetooth" 2021-12-16 18:10:44 +00:00
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
7b93d69e16 Merge "Add Wifi HAL supplicant AIDL interface definitions." am: a798cf2c63 am: dc3be74728
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1916957

Change-Id: Ida9607319241549e774f41f493c02022870a606a
2021-12-15 22:33:15 +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
Etienne Ruffieux
f58147b712 Renamed bluetooth apex name to com.android.bluetooth
Tag: #feature
Bug: 206614050
Test: Compiles
Change-Id: I1118409952f16001b1144c91be1e9c81b0c489f0
2021-12-15 15:46:05 +00: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
6e2b1afdeb Merge "KeyMint VTS: ATTEST_KEY has no other purpose" am: a67b0441fe am: 02c4ee0dca am: 35392ef70e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1844276

Change-Id: Ia77411d469b6a291ec333ea27150c5eef8eb2ac1
2021-12-15 07:11:46 +00:00
David Drysdale
35392ef70e Merge "KeyMint VTS: ATTEST_KEY has no other purpose" am: a67b0441fe am: 02c4ee0dca
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1844276

Change-Id: I6ce6d12e2c1defae42bcc247955c9ccd31c7bac8
2021-12-15 06:57:37 +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
7eab7e559d [automerger skipped] Merge "Merge Android 12 QPR1" am: b16c246ddc -s ours am: e40637adf0 -s ours am: 53e7b5b60b -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: Ie578b224a05a5ce1e32444bc55fc5acdebe84414
2021-12-14 21:51:11 +00:00
Xin Li
53e7b5b60b [automerger skipped] Merge "Merge Android 12 QPR1" am: b16c246ddc -s ours am: e40637adf0 -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: Ia14144ad408b3b93619be1e354e3f74a33cac687
2021-12-14 21:24:22 +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
3d160da02b Merge "Revert^2 "KeyMint HAL: add curve 25519, bump version"" am: 0834ba697f am: 07069c9e35 am: e41208c9b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1920687

Change-Id: Ia91f7c63a2837ca37485aebfa3bfa8fab463d542
2021-12-14 19:40:34 +00:00
Seth Moore
e41208c9b4 Merge "Revert^2 "KeyMint HAL: add curve 25519, bump version"" am: 0834ba697f am: 07069c9e35
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1920687

Change-Id: I339a10f59fda9025e2476cf5368025e420ce8e4a
2021-12-14 19:23:56 +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
53c7517b02 Merge "CHECK -> CHECK_EQ copy pasta" am: a8138bfbf6 am: dd39b5c9d0 am: f711c9d406
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1921302

Change-Id: I9b89252729e62a12050df91ee7f7747895ae905e
2021-12-14 18:22:29 +00:00
Steven Moreland
f711c9d406 Merge "CHECK -> CHECK_EQ copy pasta" am: a8138bfbf6 am: dd39b5c9d0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1921302

Change-Id: I245a8813187363f7b7fb2d227c82e9b1b3aa48da
2021-12-14 18:06:19 +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
01881f45fb Merge "Revert^2 "health: require AIDL HAL and deprecate HIDL HAL."" am: ac7e154391 am: 41aaa16fca am: ce2c6d611d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918954

Change-Id: I89e78196a762820c76fb5a068683f69103c84a4b
2021-12-13 22:22:50 +00:00
Treehugger Robot
ce2c6d611d Merge "Revert^2 "health: require AIDL HAL and deprecate HIDL HAL."" am: ac7e154391 am: 41aaa16fca
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918954

Change-Id: I235300ecfc7cc1c8e2294d8ad476bfac31cc1ba4
2021-12-13 22:05:53 +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
633046efb2 Merge "Revert "KeyMint HAL: add curve 25519, bump version"" am: 391a772300 am: f121b2c2bb am: 4df4387267
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918632

Change-Id: I62794f74ce795658e6b5408c2e0a927b10e5f524
2021-12-13 16:52:02 +00:00
Eran Messeri
4a9da1da1a Merge "Keymint: Test that corrupting the signature for HMAC verification fails" am: 924613950c am: 309c32adb7 am: a7ee9f53ed
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1915101

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

Change-Id: I2cb8d4e77e93be8c0bfa84abf31190a30005f4b2
2021-12-13 16:36:59 +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
Eran Messeri
a7ee9f53ed Merge "Keymint: Test that corrupting the signature for HMAC verification fails" am: 924613950c am: 309c32adb7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1915101

Change-Id: I4b17ae4edc7a498feaaeb51e4ee861d3182bef03
2021-12-13 16:30:45 +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