Commit Graph

28584 Commits

Author SHA1 Message Date
Tommy Chiu
fd39bf2f45 Merge "KeyMaster vts: Allow --dump_attestations to show whole DEVICE_UNIQUE_ATTESTATION" am: ced9a11bbe am: e881bbdda7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1703026

Change-Id: I8a8d954559fc68015d5aa0665dc76a88365c20e9
2021-05-13 01:25:20 +00:00
Tommy Chiu
e881bbdda7 Merge "KeyMaster vts: Allow --dump_attestations to show whole DEVICE_UNIQUE_ATTESTATION" am: ced9a11bbe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1703026

Change-Id: Ia8ef8a864954cf29d34f2d9c242d015cd33df9b3
2021-05-13 00:55:05 +00:00
Tommy Chiu
ced9a11bbe Merge "KeyMaster vts: Allow --dump_attestations to show whole DEVICE_UNIQUE_ATTESTATION" 2021-05-13 00:37:08 +00:00
Andrew Scull
ef744ddd5f identity: fix CBOR 8-byte integer encoding am: 29ba064996 am: eb0b5841b5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705256

Change-Id: I54092f39ba69a669242f0b4bd13f5b592c3fe9b2
2021-05-12 17:01:23 +00:00
Andrew Scull
eb0b5841b5 identity: fix CBOR 8-byte integer encoding am: 29ba064996
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705256

Change-Id: Iad2bc1309a66e2f73b3c7a219eb03d77b784707e
2021-05-12 16:39:58 +00:00
Andrew Scull
29ba064996 identity: fix CBOR 8-byte integer encoding
8-byte intergers are identified by the additional information having the
value 27.

Test: atest VtsHalIdentityTargetTest
Change-Id: I986162c4966275d7589d99c08c7323445e1f9e80
2021-05-12 15:08:51 +00:00
Tommy Chiu
566d1cb6e0 KeyMaster vts: Allow --dump_attestations to show whole DEVICE_UNIQUE_ATTESTATION
This debug option used to dump only leaf certificate.

Bug: 187803288
Change-Id: I6cd55597e5127f8aada3dc31ab3e81595f4affbf
2021-05-12 18:04:19 +08:00
Benjamin Schwartz
1aaf18b6f2 Merge "power/stats: Correct language surrounding timestamps" am: 75d7e5de7c am: f2d5702776
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1703725

Change-Id: I166478e51a53c25b5d08bac9965dc787cdcc50c8
2021-05-12 00:11:00 +00:00
Benjamin Schwartz
f2d5702776 Merge "power/stats: Correct language surrounding timestamps" am: 75d7e5de7c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1703725

Change-Id: I36c4fd2ebbd4469cacd18c60b92c4c7d832bd17c
2021-05-11 23:56:25 +00:00
Benjamin Schwartz
75d7e5de7c Merge "power/stats: Correct language surrounding timestamps" 2021-05-11 23:42:59 +00:00
Benjamin Schwartz
1a16edd42b power/stats: Correct language surrounding timestamps
Bug: 187408125
Test: build
Change-Id: Ib3bdb7a16f4e9a5acec2e2afad41bbd6c036a27a
2021-05-11 10:22:13 -07:00
Treehugger Robot
ce776a300a Merge changes from topic "aosp-nnapi-reusable-execution-canonical" am: 43ae2ecfe4 am: 1d5c701a44
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1701932

Change-Id: I55aa11abc58ced070bdd0399a9acae69862c754a
2021-05-11 07:39:55 +00:00
Xusong Wang
5df141b422 Introduce reusable execution to canonical interface -- HAL. am: 5f6bedb43a am: 0a924716b0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1701931

Change-Id: Ib58e2d075cdbcbfc7b96a05d21968d2b2f878b7f
2021-05-11 07:39:52 +00:00
Treehugger Robot
1d5c701a44 Merge changes from topic "aosp-nnapi-reusable-execution-canonical" am: 43ae2ecfe4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1701932

Change-Id: If503fe78b3281a7a6feffdceacff45fb1b0c93bb
2021-05-11 07:23:49 +00:00
Xusong Wang
0a924716b0 Introduce reusable execution to canonical interface -- HAL. am: 5f6bedb43a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1701931

Change-Id: I553d3d8334d0b346c1d6ef5079a8d4eaf0c52577
2021-05-11 07:23:03 +00:00
Treehugger Robot
43ae2ecfe4 Merge changes from topic "aosp-nnapi-reusable-execution-canonical"
* changes:
  Introduce reusable burst to canonical interface -- HAL.
  Introduce reusable execution to canonical interface -- HAL.
2021-05-11 07:02:17 +00:00
Treehugger Robot
3f83fa6630 Merge "Fix bug for none fe test case" am: 7dc7626822 am: 62069b5509
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1700828

Change-Id: I0fd9fb134e977a374411167273908cbf4176f2d4
2021-05-11 00:34:25 +00:00
Treehugger Robot
62069b5509 Merge "Fix bug for none fe test case" am: 7dc7626822
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1700828

Change-Id: I524a4703b634115a890813f7196a758d0398469d
2021-05-11 00:16:49 +00:00
Treehugger Robot
7dc7626822 Merge "Fix bug for none fe test case" 2021-05-10 23:56:36 +00:00
Xusong Wang
b2e8085ce2 Introduce reusable burst to canonical interface -- HAL.
This CL modifies the canonical interface for reusable burst executions:
- Add new method IBurst::createExecution

The reusable burst execution will not fallback to another execution path
if sending request packet fails. The behavior of single-time burst
execution remains unchanged.

Additionally, this CL enables pointer -> shared memory conversion in
1.2/1.3 burst implementation.

Bug: 184073769
Test: NNT_static
Test: neuralnetworks_utils_hal_1_0_test
Test: neuralnetworks_utils_hal_1_1_test
Test: neuralnetworks_utils_hal_1_2_test
Test: neuralnetworks_utils_hal_1_3_test
Test: neuralnetworks_utils_hal_common_test
Change-Id: Iaac81668d247c2cb76d70e6abbd10f00b397b19f
Merged-In: Iaac81668d247c2cb76d70e6abbd10f00b397b19f
(cherry picked from commit ead6d37ae9)
2021-05-10 15:22:08 -07:00
Xusong Wang
5f6bedb43a Introduce reusable execution to canonical interface -- HAL.
This CL modifies the canonical interface for reusable executions:
- Add new interface: IExecution with compute and computeFenced methods
- Add new method IPreparedModel::createExecution

In NNAPI runtime, the new interface IExecution is used to
memoize request-specific execution resources (e.g. converted HAL
request). The expected usage is that, IPreparedModel::createExecution
will be invoked in the first computation of a reusable NDK ANNExecution
object, and IExecution::compute* will be invoked repeatedly.

The IPreparedModel::execute* methods are preserved to avoid redundant
object creation and memoization overhead for a single-time
(non-reusable) execution.

For a vendor implementing the canonical interfaces, only the
IPreparedModel::execute* methods will be called because there is
currently no reusable execution at HAL interface. A DefaultExecution
implementation is provided to reduce the work needed on the vendor side.

Bug: 184073769
Test: NNT_static
Test: neuralnetworks_utils_hal_1_0_test
Test: neuralnetworks_utils_hal_1_1_test
Test: neuralnetworks_utils_hal_1_2_test
Test: neuralnetworks_utils_hal_1_3_test
Test: neuralnetworks_utils_hal_common_test
Test: neuralnetworks_utils_hal_aidl_test
Change-Id: I91790bb5ccf5ae648687fe603f88ffda2c9fd2b2
Merged-In: I91790bb5ccf5ae648687fe603f88ffda2c9fd2b2
(cherry picked from commit 727a7b2104)
2021-05-10 15:21:36 -07:00
junyulai
631cfe246e [SP37] Change requirement of older event callback. am: 88b237cfb5 am: 68d5aacea7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1689586

Change-Id: Ic9e7f13c081dc30c9f4115261214a9a5f4b66763
2021-05-10 21:27:41 +00:00
junyulai
68d5aacea7 [SP37] Change requirement of older event callback. am: 88b237cfb5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1689586

Change-Id: I9285682a35a5ed9310dcaa8f68915187bf9cded1
2021-05-10 21:10:57 +00:00
Henry Fang
dfb386f9f3 Fix bug for none fe test case
Test: atest VtsHalTvTunerV1_0TargetTest

bug: 182519645
Change-Id: I5deca5fe7f4f023cbadaf54f894657c1c6efe38a
Merged-In: I86458142ba4155274594a793eb939567bea24734
2021-05-10 16:09:40 +00:00
junyulai
88b237cfb5 [SP37] Change requirement of older event callback.
Currently, vendors are asked to duplicate old events to onEvent()
and onEvent_1_1(). This is not the typically way other modules
would do. Thus, remove the requirement of duplicate events,
and replace it with only firing onEvent_1_1 when feasible.

Note no VTS is added currently, from vendor feedback, there is
no reliable way to guarantee the callbacks will be called in the
test.

Test: hidl-gen -L hash -r android.hardware:hardware/interfaces \
      android.hardware.tetheroffload.control@1.1
Bug: 149467454
Merged-In: I75c1a7788e5d48fb3e2836d54b4fd854c0247214
Change-Id: I75c1a7788e5d48fb3e2836d54b4fd854c0247214
  (cherry-picked from ag/14408065)
2021-05-10 11:37:57 +08:00
David Drysdale
ed14339954 Merge changes I32ad8ad2,I86047955 am: 6d454d5f28 am: 399e7b3298
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1695611

Change-Id: I4cdd0c7294f389ca57b486f018452aca3b10e9bd
2021-05-06 05:57:28 +00:00
David Drysdale
399e7b3298 Merge changes I32ad8ad2,I86047955 am: 6d454d5f28
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1695611

Change-Id: I743a1000be7c49b16b2b4c7ab494e11791b2699f
2021-05-06 05:42:31 +00:00
David Drysdale
6d454d5f28 Merge changes I32ad8ad2,I86047955
* changes:
  KeyMint VTS: symmetric import test with bad keylen
  KeyMint HAL: restore getKeyCharacteristics() docs
2021-05-06 05:26:31 +00:00
Shawn Willden
1177d0a047 Merge "Added a new test case to validate AES algorithm with invalid key sizes." am: aef2a7562e am: f61a68c6e7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1679665

Change-Id: Ib474e4b71297504edca205916a06cb25aabf6be4
2021-05-05 20:22:20 +00:00
Shawn Willden
f61a68c6e7 Merge "Added a new test case to validate AES algorithm with invalid key sizes." am: aef2a7562e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1679665

Change-Id: I63bcfe3b06f7c00a426c6c30365062ce9ebdc39e
2021-05-05 20:05:00 +00:00
Shawn Willden
aef2a7562e Merge "Added a new test case to validate AES algorithm with invalid key sizes." 2021-05-05 19:48:28 +00:00
David Drysdale
c9bc2f742d KeyMint VTS: symmetric import test with bad keylen
Test: VtsAidlKeyMintTargetTest
Change-Id: I32ad8ad2ca2b18d3279ebe77ba63b34457ab888d
2021-05-05 15:59:39 +01:00
David Drysdale
d0bc4b9e64 KeyMint HAL: restore getKeyCharacteristics() docs
Commit 40eb8f53ea ("KeyMint AIDL tweaks") removed references to
getKeyCharacteristics() in docs, as it was a KeyMaster entrypoint
that wasn't present on the KeyMint HAL.

Commit dadb18dd29 ("Add getKeyCharacteristics method to KeyMint")
added the getKeyCharacteristics() entrypoint to KeyMint, as it
turned out it was needed after all.

This commit restores references to getKeyCharacteristics() in the
Tag.aidl documentation.

Test: VtsAidlKeyMintTargetTest
Change-Id: I860479554b85f4adfeddd4eee70a09cf5265c938
2021-05-05 15:58:43 +01:00
Tommy Chiu
5dc2627249 Merge "vts: Correct the parameters on strongbox" am: 384c82dd14 am: 01409e422d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1693566

Change-Id: Ibd5dc16449cef902eff49af984036735c65b387e
2021-05-05 14:45:34 +00:00
Tommy Chiu
01409e422d Merge "vts: Correct the parameters on strongbox" am: 384c82dd14
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1693566

Change-Id: I54183e5ae68fa3112ef431040fb1c74e3add2665
2021-05-05 14:24:55 +00:00
Tommy Chiu
384c82dd14 Merge "vts: Correct the parameters on strongbox" 2021-05-05 14:08:48 +00:00
Andy Hung
6660615822 Merge "StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED" am: 66ffc5b99a am: 1e1514be04
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692490

Change-Id: I97c94630cd48b9a0354c9b76e593ea0205a633b4
2021-05-04 21:37:16 +00:00
Andy Hung
1e1514be04 Merge "StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED" am: 66ffc5b99a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692490

Change-Id: I8da5b65e922c3fae06d29f4e4a990d66dacfe5d0
2021-05-04 21:13:54 +00:00
Andy Hung
66ffc5b99a Merge "StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED" 2021-05-04 20:49:44 +00:00
Shawn Willden
a8a4cb0028 Merge changes Ic8949e22,Ia3a6363d am: da2b9ae9f8 am: 8226694fcf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1694706

Change-Id: I1e13b6c6ca3a8a1dac8e1e89f9ceaa03986a0900
2021-05-04 20:24:33 +00:00
Shawn Willden
8226694fcf Merge changes Ic8949e22,Ia3a6363d am: da2b9ae9f8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1694706

Change-Id: Ie1a7951c7b3a6fc5d7978ece75c1791efac95029
2021-05-04 20:09:27 +00:00
Shawn Willden
da2b9ae9f8 Merge changes Ic8949e22,Ia3a6363d
* changes:
  Update DeviceUniqueAttestationTest to match spec
  Make AttestKeyTest not crash if no cert is returned.
2021-05-04 19:50:41 +00:00
Tommy Chiu
3950b45a44 vts: Correct the parameters on strongbox
If GenerateKey() with user-provide key_blob, it needs to be specified in
the following begin() operations as well. Update the test case just to
take key_blob from private member instead of creating a local one.

Note:
- Remove redudent TAG_NO_AUTH_REQUIRED in DeviceUniqueAttestationTest

Change-Id: I81860294e1e7e01a57e66e08e75507a8292ec0c3
2021-05-04 23:09:56 +08:00
David Drysdale
f15bc0f935 Merge "More KeyMint VTS testcases" am: 3368b3c6b0 am: f8991afa01
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1676298

Change-Id: Ie69fd95c64e89360757e889ae4819c0ac5b275d9
2021-05-04 08:42:10 +00:00
David Drysdale
f8991afa01 Merge "More KeyMint VTS testcases" am: 3368b3c6b0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1676298

Change-Id: Iaeae2f4fc574defd77ead2f8c0a14523eeabfde4
2021-05-04 08:28:26 +00:00
David Drysdale
3368b3c6b0 Merge "More KeyMint VTS testcases" 2021-05-04 08:00:41 +00:00
Shawn Willden
ced5c2c23a Update DeviceUniqueAttestationTest to match spec
Test: VtsAidlKeyMintTargetTest
Change-Id: Ic8949e223eb7ba2445d4738dcd9b31a1d244bb46
2021-05-03 16:36:49 -06:00
Shawn Willden
c410f6fb44 Make AttestKeyTest not crash if no cert is returned.
Test: VtsAidlKeyMintTargetTest
Change-Id: Ia3a6363d854742681f684ff989b98b7cfda30746
2021-05-03 16:36:33 -06:00
Marco Nelissen
2b180742ae Merge "Expand Gatekeeper test" am: a3645d38e9 am: 3a17b7adf6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1609723

Change-Id: I82cbb49766e02b006d47e4b49081a8f946392f7a
2021-05-03 22:14:58 +00:00
Marco Nelissen
3a17b7adf6 Merge "Expand Gatekeeper test" am: a3645d38e9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1609723

Change-Id: I170873fb500893c1f4c88da948eed2bafe3e3e8d
2021-05-03 21:51:51 +00:00