Commit graph

35504 commits

Author SHA1 Message Date
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
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
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
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
e274e87d59 Merge "KeyMint HAL: add curve 25519, bump version" am: f21e1a5c4a am: 5a63e3ea57 am: e373da49f8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1900930

Change-Id: I056c55e445fcedc90a6d238b9907225932d465aa
2021-12-13 15:34:45 +00:00
David Drysdale
e373da49f8 Merge "KeyMint HAL: add curve 25519, bump version" am: f21e1a5c4a am: 5a63e3ea57
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1900930

Change-Id: Ie07c4629dfbf32a8e3cdde205292576e93eb9c77
2021-12-13 15:12:09 +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
ab61ace977 Merge "Improve getModemActivityInfo API" am: aa8c59bea2 am: b60680edf3 am: 0331c954fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895248

Change-Id: If0ac3d85f7de6619267eaad5237b0d4582e50e77
2021-12-13 04:27:38 +00:00
Treehugger Robot
0331c954fc Merge "Improve getModemActivityInfo API" am: aa8c59bea2 am: b60680edf3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895248

Change-Id: I6fbc96503333f87cfdcaf8d1021403a7c2f8dc56
2021-12-13 04:12:52 +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
6c9a09cdc5 Merge "FL7: Refine REVERSE specification" am: dd26914af7 am: d90a3fdb5a am: 84924a175d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1915765

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

Change-Id: I872ee99828d61af69aaf4e0d2ecc192ca026ba49
2021-12-10 22:44:05 +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
0f385bdb51 Merge "Revert "health: require AIDL HAL and deprecate HIDL HAL."" am: 5ad3bb1f87 am: e5f1c03414 am: fd797c42f0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918448

Change-Id: Ibc2daf1701ba83419d77ba972dcffbc699e875ad
2021-12-10 22:09:41 +00:00
Yifan Hong
fd797c42f0 Merge "Revert "health: require AIDL HAL and deprecate HIDL HAL."" am: 5ad3bb1f87 am: e5f1c03414
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918448

Change-Id: I75809427bfc942a61e9d68cecb5b657b64b24e7f
2021-12-10 21:54:44 +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
eba95b5d50 Merge "Clean up: remove LE audio hardware offload in Bluetooth audio HAL 2.1" am: 297d2f1c44 am: 756676341a am: 41c374b986
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1917160

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

Change-Id: I3259071c6acad9abef52dbdbf856ceb9783d8c04
2021-12-10 08:06:16 +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
edf7c8344b Merge "health: require AIDL HAL and deprecate HIDL HAL." am: 6327a1ac33 am: c201a91c35 am: 90cd53660a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1891478

Change-Id: I597edd1cb8161406f8bc7b93545b288eac1d5b4a
2021-12-10 07:03:45 +00:00
Yifan Hong
90cd53660a Merge "health: require AIDL HAL and deprecate HIDL HAL." am: 6327a1ac33 am: c201a91c35
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1891478

Change-Id: I07bc99f8ed8d06326d412dd0e7ed538472975eee
2021-12-10 06:49:47 +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
ab9fa264c1 Merge "Pass sink metadata to Bluetooth" am: cd9bb98da1 am: 0b32a54b2a am: 4951286da9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1907864

Change-Id: I42d12fbf09be44af086f83aa6240241a929d329c
2021-12-09 21:48:42 +00:00
Jakub Pawłowski
4951286da9 Merge "Pass sink metadata to Bluetooth" am: cd9bb98da1 am: 0b32a54b2a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1907864

Change-Id: I8cbd65327916f072307813359ab347a92b04dda8
2021-12-09 21:24:43 +00: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