Commit graph

36252 commits

Author SHA1 Message Date
David Drysdale
1585fdceb5 KeyMint VTS: check for relevant devices
Don't run tests if the appropriate KeyMint device is not available (e.g.
on something that only has Keymaster).  Move to use GTEST_SKIP
consistently.

Bug: 221909227
Test: VtsAidlKeyMintTargetTest
Change-Id: I5dab238519e57e6752b795f3a983681cf4337bdd
2022-03-08 08:07:02 +00:00
Xin Li
cbc6a3305e Merge Android 12L
Bug: 222710654
Merged-In: Ib7ed106fb09dcfa246bd0a31515fbbb358259de0
Change-Id: Ifb4059c9c03a8a1ff6a1efd952dd088f0e5a8a9d
2022-03-08 00:18:37 +00:00
Treehugger Robot
bfdd991c76 Merge "Split AESincremental VTS test into 4 Tests(For blockmodes-ECB,CBC,GCM,CTR)" am: 90019d46c2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2007030

Change-Id: Ib7ed106fb09dcfa246bd0a31515fbbb358259de0
2022-03-04 18:07:02 +00:00
Treehugger Robot
90019d46c2 Merge "Split AESincremental VTS test into 4 Tests(For blockmodes-ECB,CBC,GCM,CTR)" 2022-03-04 17:39:57 +00:00
Treehugger Robot
1421c4a7ef Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: 509a0223c1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2007830

Change-Id: I765a7a945896e8e9eaf74412a13c7498f5c84e78
2022-03-04 01:54:36 +00:00
Treehugger Robot
509a0223c1 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" 2022-03-04 01:29:05 +00:00
Michael Butler
c7d8c19823 Merge "Make NN canonical->HIDL adapter execute* methods synchronous" am: f955569c8a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2005130

Change-Id: Icff3acb7b47cc84518222e9f37b7515d6783cb73
2022-03-04 01:01:09 +00:00
Michael Butler
f955569c8a Merge "Make NN canonical->HIDL adapter execute* methods synchronous" 2022-03-04 00:41:10 +00:00
Bob Badour
8fbe33dfbe [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  automotive/can/1.0/default/tests/fuzzer/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Id04cc3a1ae434664be40944cc86c8ffc2e19db24
2022-03-03 10:37:24 -08:00
anil.hiranniah
19a4ca17ea Split AESincremental VTS test into 4 Tests(For blockmodes-ECB,CBC,GCM,CTR)
Change mentioned above is done in VTS for Keymaster4.0
and Keymint

Test: VTS tests with tradefed
Change-Id: Id62fdce65131ee00c88e5849955a937f1c171748
2022-03-03 18:02:04 +05:30
Yifan Hong
577ea5663a Merge "health: batterymonitor uses AIDL HealthInfo." am: e9cb1bedfd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2004612

Change-Id: Ic95ccd4d9740774ad9d76491329b61b609874c4a
2022-03-02 19:41:59 +00:00
Yifan Hong
e9cb1bedfd Merge "health: batterymonitor uses AIDL HealthInfo." 2022-03-02 19:20:31 +00:00
Cory Barker
96c8da665f Merge "Added automotiveCanV1.0_fuzzer" am: 20b69d76d0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1991533

Change-Id: Iccc4e6a9349cc2fc865dfdbd608462673318e964
2022-03-02 18:46:12 +00:00
Cory Barker
20b69d76d0 Merge "Added automotiveCanV1.0_fuzzer" 2022-03-02 18:22:12 +00:00
Treehugger Robot
3b6c35b95e Merge "Support for P256 curve in RKP for Strongbox Test: Run Rkp Vts tests." am: 55419fd935
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1969799

Change-Id: I8e1f6d577c20c1c583fb92b351c947479142dc7a
2022-03-02 12:09:43 +00:00
Treehugger Robot
55419fd935 Merge "Support for P256 curve in RKP for Strongbox Test: Run Rkp Vts tests." 2022-03-02 11:45:05 +00:00
Michael Butler
d65dc06ddc Make NN canonical->HIDL adapter execute* methods synchronous
This change alters the asynchronous execute* methods to be handled
synchronously (from the same thread) for three reasons:
1) To remove the need to use IPreparedModel::getUnderlyingResource
2) To simplify the code
3) To make the code more performant

Bug: N/A
Test: mma
Test: presubmit
Change-Id: I2c37deb03d1b1c34b0173bd741e55fce4de757f7
2022-03-01 16:16:26 -08:00
Yifan Hong
bc84a7903a health: batterymonitor uses AIDL HealthInfo.
As a side effect, chargerDockOnline is properly set.

Test: TH
Bug: 222120465
Change-Id: I660e8ac0d1897ce30e3ae5d4f402a0b9ccac3c5c
2022-03-01 12:27:13 -08:00
David Drysdale
85ce9e2530 KeyMint VTS: fix fixture setup name am: 795f758780
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2003891

Change-Id: I556e90e4e9551fb365cad11263a966157fdff92b
2022-03-01 16:10:01 +00:00
David Drysdale
795f758780 KeyMint VTS: fix fixture setup name
Bug: 221909227
Test: VtsAidlKeyMintTargetTest
Change-Id: Ic0722242cee2ea21c974133e4f81b13b21e44615
2022-03-01 13:52:20 +00:00
Treehugger Robot
5eb895c047 Merge "Cast to the underlying type for union tags" am: 6cd0d474b2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1999055

Change-Id: I5421fe3e9acd67b38ae0371cb3f938e5eeeac7f4
2022-03-01 00:44:53 +00:00
Treehugger Robot
fe02196fac Merge "OMX VTS: Added a test to mandate transition to C2 codecs" am: d9aa226a60
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1973542

Change-Id: Ic1840ca9a58f24e1763c67031cc12052703d1680
2022-03-01 00:44:34 +00:00
Treehugger Robot
6cd0d474b2 Merge "Cast to the underlying type for union tags" 2022-03-01 00:24:55 +00:00
Treehugger Robot
d9aa226a60 Merge "OMX VTS: Added a test to mandate transition to C2 codecs" 2022-03-01 00:20:47 +00:00
Treehugger Robot
02b7992b62 Merge "Update KeyMint VINTF fragment to version 2" am: 73e15472a4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2002270

Change-Id: Ice830ca23216d33c72d61d13003ec7bcf752e969
2022-02-28 22:04:25 +00:00
Treehugger Robot
73e15472a4 Merge "Update KeyMint VINTF fragment to version 2" 2022-02-28 21:46:00 +00:00
Shawn Willden
ef8bdc4f1d Update KeyMint VINTF fragment to version 2
Bug: 221390931
Test: vts -m vts_treble_vintf_vendor_test
Change-Id: I62746b9b60b4b236c0cbb8d2c2edd519c61a71ac
2022-02-28 09:35:59 -07:00
Jooyung Han
0bdded6d5a Cast to the underlying type for union tags
Union tags are of enum type. Streaming it would make more sense by
casting to underlying types.

For now casting is not required since tags are defined as `enum Tag`.
But we're going to change it to `enum class Tag` which won't work with
operator<< without casting.

Bug: 218912230
Test: m
Change-Id: Ia5e8a5c38fe23c72dffbdca320a32abdfa0eb38e
2022-02-26 21:10:12 +09:00
Joseph Jang
7a6999efd5 Merge "Export extractDerSubjectFromCertificate() utility API for oem Hal usage" am: a66f64d05d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1996432

Change-Id: I9194eaf9a5d934cd113918eae5c1e06a61917ac1
2022-02-25 07:52:45 +00:00
Joseph Jang
a66f64d05d Merge "Export extractDerSubjectFromCertificate() utility API for oem Hal usage" 2022-02-25 07:27:06 +00:00
Chen Chen
92fbebc89f Merge "SpatialAudio: Init codec and buffer size from startStream()" am: 3b04e113e6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1989506

Change-Id: I2bd3579135835f1f2275400505c1f5dc0aff88f0
2022-02-24 19:54:15 +00:00
Chen Chen
3b04e113e6 Merge "SpatialAudio: Init codec and buffer size from startStream()" 2022-02-24 19:39:33 +00:00
Chen Chen
0a68a920cc SpatialAudio: Init codec and buffer size from startStream()
Bug: 214615268
Test: build
Tag: #feature
Change-Id: I26d82da0dfc82fcb6cab6b879bced8e892e8cf44
2022-02-24 18:40:27 +00:00
Treehugger Robot
9a7ab7c60b Merge "KeyMint: Test generation of asymmetric keys fails with missing parameters" am: 72358dab6a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895034

Change-Id: Ib9ba132fd500f8552b453a9fdb4dad2ed69e3a8f
2022-02-24 16:43:48 +00:00
Treehugger Robot
72358dab6a Merge "KeyMint: Test generation of asymmetric keys fails with missing parameters" 2022-02-24 16:14:21 +00:00
Michael Butler
13a6d16614 Merge "Remove NN host specific build defines" am: fe9368b729
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1997731

Change-Id: If387ac212a2a1e92b59525f870c6c97742a96ebe
2022-02-24 01:31:54 +00:00
Michael Butler
fe9368b729 Merge "Remove NN host specific build defines" 2022-02-24 00:59:51 +00:00
Chih-hung Hsieh
fa83970b3a Merge "Add timed out test files to tidy_timeout_srcs" am: ff54f73b4f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1992232

Change-Id: Ic6072a539d185abc0bcce2ef1dd4a96ddf70e3b8
2022-02-24 00:40:48 +00:00
Chih-hung Hsieh
ff54f73b4f Merge "Add timed out test files to tidy_timeout_srcs" 2022-02-24 00:21:18 +00:00
Michael Butler
323bddccc6 Remove NN host specific build defines
These defines are redundant because they are already defined in
neuralnetworks_utils_defaults.

Bug: N/A
Test: mma
Change-Id: I1c5c44e9e61da19bc10dd8ed2e38099f7c4baccd
2022-02-23 11:44:53 -08:00
Treehugger Robot
11c970f706 Merge "Provide alternate SE RoT provisioning path." am: 07011d9e09
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1982797

Change-Id: Ia74ce0dba7595e9eb8c080c150174b49b7c509b1
2022-02-23 18:24:12 +00:00
Treehugger Robot
07011d9e09 Merge "Provide alternate SE RoT provisioning path." 2022-02-23 18:13:01 +00:00
Alice Kuo
c6e816aad8 Merge "Set bluetooth.audio AIDL HAL to mandatory for Android T" am: 53b601d590
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1977705

Change-Id: I8f194ce924f85df1202c37fa0dcab42a00628bdc
2022-02-23 16:33:06 +00:00
Alice Kuo
53b601d590 Merge "Set bluetooth.audio AIDL HAL to mandatory for Android T" 2022-02-23 10:53:32 +00:00
Joseph Jang
5341ebba50 Export extractDerSubjectFromCertificate() utility API for oem Hal usage
mDL oem Hal may need X509 utility API to extract subject name from certificate.

Bug: 218613398
Change-Id: I6316dfb3f1c50394af2d3d35c95d616bd6a2106b
2022-02-23 07:39:03 +00:00
Shawn Willden
0cc617cab0 Provide alternate SE RoT provisioning path.
On some devices it is infeasible to provision the KeyMint RoT bits in
the Android Bootloader.  This provides an alternate path to provision
them from the TEE during early boot.

Bug: 219076736
Test: VtsAidlKeyMintTargetTest
Change-Id: If69f7e25e58edbf4d2190084e2c0a03a94bfa5d6
Merged-In: If69f7e25e58edbf4d2190084e2c0a03a94bfa5d6
2022-02-22 23:52:18 -07:00
subrahmanyaman
fb213d6031 Support for P256 curve in RKP for Strongbox
Test: Run Rkp Vts tests.

Change-Id: Ic38fd2318dd8749ae125f1e78d25f2722bd367e5
2022-02-23 05:02:40 +00:00
Treehugger Robot
1331953ef3 Merge "Add @PropagateAllowBlocking tag to supplicant methods that return an interface." am: 4965e27b86
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1964740

Change-Id: If47724de35d8399d0e391a29a4aa92aa4e1dbbd7
2022-02-22 17:28:45 +00:00
Treehugger Robot
4965e27b86 Merge "Add @PropagateAllowBlocking tag to supplicant methods that return an interface." 2022-02-22 17:07:12 +00:00
Alice Kuo
d3f8b39e76 Remove bluetooth.audio@2.2 default implementation and utils handles am: 921760d9a7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1959014

Change-Id: I38f8e9a73d41727909a88d5bbe4f95bef560bcc6
2022-02-22 11:32:11 +00:00