Commit graph

28688 commits

Author SHA1 Message Date
David Drysdale
8c00b2bc53 Merge "KeyMint HAL: cert dates are in milliseconds" am: 8d1d302ffa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1697336

Change-Id: I4577693fc899387b615e0f89be171c5457b39d46
2021-05-17 14:05:28 +00:00
David Drysdale
8d1d302ffa Merge "KeyMint HAL: cert dates are in milliseconds" 2021-05-17 13:45:21 +00:00
Tommy Chiu
e56e43ed89 Merge "KeyMint vts: Correct the EC curve parameter and some return code" am: 77aae9e40e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1703027

Change-Id: I968a78699c38e4a8e50dc6cde80021fecbe48e8d
2021-05-15 02:19:12 +00:00
Tommy Chiu
77aae9e40e Merge "KeyMint vts: Correct the EC curve parameter and some return code" 2021-05-15 01:50:30 +00:00
Treehugger Robot
9f4239423d Merge "KeyMint VTS: fix 3DES key sizes" am: 4862e3f6f3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699808

Change-Id: I4d5ab048ce1cf7852bc66e4410694d9c0e1255ea
2021-05-14 22:14:06 +00:00
Treehugger Robot
4862e3f6f3 Merge "KeyMint VTS: fix 3DES key sizes" 2021-05-14 21:55:00 +00:00
Treehugger Robot
6ece4c1da3 Merge changes Id027b742,I486ccad8 am: 44c294e621
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705136

Change-Id: Iaf5b44fc72dd3ad259d22ed04cf20f215f9136c2
2021-05-14 21:18:35 +00:00
Gareth Fenn
86d8d2caf2 Add additional DVBT settings to TunerTestingConfig am: 8fa4cff4ce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705148

Change-Id: Ia337384e925b7d7109a7985c5e2a582c3b97461d
2021-05-14 21:17:47 +00:00
Treehugger Robot
44c294e621 Merge changes Id027b742,I486ccad8
* changes:
  Add additional DVBT settings example usage to sample_tuner_vts_config.xml
  Add additional DVBT settings to TunerTestingConfig
2021-05-14 20:59:39 +00:00
Gareth Fenn
b9722f1236 Add additional DVBT settings example usage to sample_tuner_vts_config.xml
Test: atest VtsHalTvTunerV1_0TargetTest

Change-Id: Id027b74267e97822f76607545bf23174a623e74e
Merged-In: I58bd8b941f6340d9e69153702b5269cc35c646da
2021-05-14 18:23:21 +00:00
Gareth Fenn
8fa4cff4ce Add additional DVBT settings to TunerTestingConfig
Test: atest VtsHalTvTunerV1_0TargetTest

Change-Id: I486ccad855662e6b9fa7cd1be3eb3949356d6a1f
Merged-In: I58bd8b941f6340d9e69153702b5269cc35c646da
2021-05-14 16:34:36 +00:00
Treehugger Robot
898f676017 Merge "Adding 1s time gap between slot1 & slot2 setDataThrottling tests" am: 9f7a1e8317
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705149

Change-Id: I8906af50a9ae7f8f058bed623335806ce0ddf6e0
2021-05-14 06:25:13 +00:00
Treehugger Robot
9f7a1e8317 Merge "Adding 1s time gap between slot1 & slot2 setDataThrottling tests" 2021-05-14 06:13:08 +00:00
Aaron Tsai
90f0c0e3be Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" am: 058de98e44
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699825

Change-Id: I1d76c931f944a62f59f71b4e26ab4257ee1c5b29
2021-05-14 03:24:24 +00:00
Aaron Tsai
058de98e44 Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" 2021-05-14 03:02:50 +00:00
Treehugger Robot
56ffb53709 Merge "Use proper alignment and padding for pointer arguments -- HAL." am: 0a3ca7b629
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1702587

Change-Id: I7a91601496932132d9c7d7fe42e265f5efd46a29
2021-05-14 00:45:15 +00:00
Treehugger Robot
0a3ca7b629 Merge "Use proper alignment and padding for pointer arguments -- HAL." 2021-05-14 00:23:33 +00:00
Anthony Stange
056a7cd65d Merge "sensors: trivial fixes in comments" am: c75b96410e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/572085

Change-Id: I919b721d2f9b5aa6323e70576a4cd1e321552901
2021-05-13 14:51:45 +00:00
Anthony Stange
c75b96410e Merge "sensors: trivial fixes in comments" 2021-05-13 14:31:40 +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
Sergii Piatakov
59bb6f9394 sensors: trivial fixes in comments
Fix trivial typos in HAL and VTS comments.

Test: n/a
Change-Id: Ib52d6e1e8e83290cb4b1cf142677b8c772d606e7
Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
2021-05-12 20:43:21 +00:00
Aaron Tsai
845f0fbd1e Fix VTS crash for getAvailableNetworks in Radio 1.6
Bug: 187494016
Test: atest VtsHalRadioV1_6TargetTest -- --test-arg com.android.tradefed.testtype.GTest:native-test-flag:"--gtest_filter=*getAvailableNetworks/0_slot1"
Change-Id: I3a3b5a0121cc97fbf6782da863d0ff6226504ee8
2021-05-12 20:31:07 +00:00
Aaron Tsai
b10493e757 Adding 1s time gap between slot1 & slot2 setDataThrottling tests
Modem has restriction that it can not process back-to-back thermal actions.
  For DSDS device, after slot-1 test finished, a 1s delay is needed before start slot-2 test.

Bug: 187968151
Test: atest VtsHalRadioV1_6TargetTest -- --test-arg com.android.tradefed.testtype.GTest:native-test-flag:"--gtest_filter=*setDataThrottling*"
Change-Id: I052d0d9c7c0ccc86a7590204679295268973c6cf
2021-05-12 20:27:27 +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
David Drysdale
59cae644e7 KeyMint VTS: local RSA encryption
Change RSA encryption (with public key) so it happens locally in the
test, rather than by invoking an ENCRYPT operation against KeyMint.

 - Specify MGF1 digest for OAEP mode as (now) required by AIDL spec.
 - Drop tests for too-long encryption inputs.
 - Adjust test comments to reflect decryption-only nature.
 - Change parameter checking tests to do so on DECRYPT rather than ENCRYPT.

Test: VtsAidlKeyMintTargetTest
Change-Id: I10c4beea28387eecfd0bc7c5dfd59a1b66fec21e
2021-05-12 16:09:44 +01: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
c93c439ad3 KeyMint vts: Correct the EC curve parameter and some return code
Strongbox doens't support p-224. Change the curve to p-256 for better
compatibility.
Also update the tags to be filtered on the hw-enforcement list.

Change-Id: I3f587c5471ca68b88a565ee9ec2e27d1e9e11b17
2021-05-12 19:13:55 +08:00
David Drysdale
df8f52ee8d KeyMint VTS: local asymmetric verification
Change verification of ECDSA and RSA signatures so it happens locally
in the test, rather than by invoking a VERIFY operation against KeyMint.

Test: VtsAidlKeyMintTargetTest
Change-Id: I0efc30f3c96cd70ac636d34718eff53cc23f1480
2021-05-12 11:51:24 +01: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
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
Xusong Wang
e3d0dad8d5 Use proper alignment and padding for pointer arguments -- HAL.
This CL modifies the shared memory allocation for pointer arguments to
use proper alignment and padding. We use default alignment (64) and
min padding (1) for HIDL drivers, and default alignment (64) and default
padding (64) for sAIDL drivers.

Bug: 184164929
Test: NNT_static
Change-Id: I22591640fa047d5f75d437edac1a7645d3b05526
Merged-In: I22591640fa047d5f75d437edac1a7645d3b05526
(cherry picked from commit 8bfa243972)
2021-05-11 09:17:34 -07: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
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
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
David Drysdale
2a73db3d9e KeyMint VTS: fix 3DES key sizes
DES key size is 7/8 of what's provided.

Test: VtsAidlKeyMintTargetTest
Change-Id: I645c1df11646d129a9421630cb6e5ed86edb8899
2021-05-10 10:59:19 +01: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
e650667341 KeyMint HAL: cert dates are in milliseconds
Test: None, comment change only
Change-Id: I6251d4a0ba74d111f4c107f9a54a5c45811aa90f
2021-05-06 08:25:33 +01: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
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