Commit graph

34572 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
3405632a1f Merge "Weaver: modify default HAL for passing VTS" am: 2697d16c43 am: 21af98f74c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1914892

Change-Id: Ie97ededdb969e62dbf462399c3239594fb579cb2
2021-12-09 04:30:10 +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
Brian Murray
7f3d007475 Merge "Avoid SIGSEGV if attest key generation fails." am: 14604af9d1 am: b07682e3db
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1915277

Change-Id: I49f0f1d6daea48ac0a92bedb0bf3db8f4ff4e87c
2021-12-08 23:22:09 +00:00
Treehugger Robot
077566d063 Merge changes I670f78af,Ie2dce95b,Ic44227c9,I5770ee41,I82d27049, ... am: a15bdb9413 am: 0e98c827b8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1909397

Change-Id: I6ec54341ea2123acb3bb8defb8471c3c2f0394a5
2021-12-08 23:19:10 +00:00
Brian Murray
b07682e3db Merge "Avoid SIGSEGV if attest key generation fails." am: 14604af9d1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1915277

Change-Id: Ie7e1c93d8b4b0084971f35ca25520f3d70cd67e0
2021-12-08 23:16:51 +00:00
Brian Murray
14604af9d1 Merge "Avoid SIGSEGV if attest key generation fails." 2021-12-08 22:59:01 +00:00
Treehugger Robot
0e98c827b8 Merge changes I670f78af,Ie2dce95b,Ic44227c9,I5770ee41,I82d27049, ... am: a15bdb9413
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1909397

Change-Id: Iaf2e40784ce2b69a57b2595da0990fe97e63a105
2021-12-08 22:54:00 +00:00
Treehugger Robot
a15bdb9413 Merge changes I670f78af,Ie2dce95b,Ic44227c9,I5770ee41,I82d27049, ...
* changes:
  Implement RadioModem for AIDL-HIDL Telephony HAL translator
  Implement RadioVoice for AIDL-HIDL Telephony HAL translator
  Implement RadioNetwork for AIDL-HIDL Telephony HAL translator
  Implement RadioData for AIDL-HIDL Telephony HAL translator
  Implement RadioSim for AIDL-HIDL Telephony HAL translator
  Implement RadioMessaging for AIDL-HIDL Telephony HAL translator
  Initial implementation of HIDL-AIDL Telephony HAL translator
2021-12-08 20:52:51 +00:00
Brian J Murray
aa8a75840f Avoid SIGSEGV if attest key generation fails.
Add an explicit check that `attested_key_cert_chain.size() > 0`.

Bug: 209672758
Test: atest 'PerInstance/AttestKeyTest#AllEcCurves/1_android_hardware_security_keymint_IKeyMintDevice_strongbox'

Signed-off-by: Brian J Murray <brianjmurray@google.com>
Change-Id: I4f7cb4fb1a30f26e6ef15c54714699f6ae91ba36
2021-12-08 10:59:22 -08:00
ChengYou Ho
af61158286 Weaver: modify default HAL for passing VTS
Bug: 178339800
Test: VtsHalWeaverTargetTest
Change-Id: I5b6991874422448b45a30d221ae4922ae7e2b0eb
2021-12-09 00:39:39 +08:00
Yifan Hong
45f18ec649 health: require AIDL HAL and deprecate HIDL HAL.
Test: builds
Bug: 177269435

Change-Id: Ibd4dec0a2ae324b1207f72a43d08bef3d8abe9f7
2021-12-07 18:01:30 -08:00
Yifan Hong
2032ec93e2 Merge "health: add libhealthshim" am: 4c12800dd8 am: e6c4962d8b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1884456

Change-Id: I6163e7a06b8654405ed8babf1607062cfc5f3eb4
2021-12-07 18:52:04 +00:00
Yifan Hong
e6c4962d8b Merge "health: add libhealthshim" am: 4c12800dd8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1884456

Change-Id: I40aca8d33109a2abcf805206d9e8472c8ad8de43
2021-12-07 18:37:33 +00:00
Yifan Hong
4c12800dd8 Merge "health: add libhealthshim" 2021-12-07 18:18:07 +00:00
David Drysdale
2a20554f45 Merge "Turn off CFI for the Keymaster VTS" am: 1ff635ab2d am: ab78c4b682
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1906291

Change-Id: If792d8c254971518aff431760585707d5a860851
2021-12-07 06:54:09 +00:00
David Drysdale
ab78c4b682 Merge "Turn off CFI for the Keymaster VTS" am: 1ff635ab2d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1906291

Change-Id: Idf81c498e1b5ef26b8d5ade160217556a81340a3
2021-12-07 06:39:35 +00:00
David Drysdale
1ff635ab2d Merge "Turn off CFI for the Keymaster VTS" 2021-12-07 06:22:35 +00:00
Seongho Kim
7a8af7d60d Gate gsm/cdma radio feature only for emergency dial am: a0b33745b5 am: ae34a9c583
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1908681

Change-Id: I6a1bfe9bc39e981eab2661ccf24f6f4733bdddc7
2021-12-07 03:48:46 +00:00
Deyao Ren
d5d23263d6 Merge "Create Apex com.android.hardware.usb for usb 1.0" am: 955cf3b233 am: be546cea3c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895176

Change-Id: Ib80301120c0235d339e4fb3580062b8df862b3bc
2021-12-07 03:48:35 +00:00
Seongho Kim
ae34a9c583 Gate gsm/cdma radio feature only for emergency dial am: a0b33745b5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1908681

Change-Id: Iaacc5a3e2bda956e633d472ff1ad75e48f1a25aa
2021-12-07 03:24:22 +00:00
Deyao Ren
be546cea3c Merge "Create Apex com.android.hardware.usb for usb 1.0" am: 955cf3b233
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895176

Change-Id: Ib3c39a1451d2f97c22756128750daf0fb93a40c6
2021-12-07 03:24:12 +00:00
Seongho Kim
a0b33745b5 Gate gsm/cdma radio feature only for emergency dial
Test: vts
Bug: 207920538
Signed-off-by: Seongho Kim <sh_tiger.kim@samsung.com>
Change-Id: I388bc51e58b5680b5b5c806d88a338822af0c8a7
2021-12-07 03:10:52 +00:00