Commit Graph

28226 Commits

Author SHA1 Message Date
Michael Butler
a4efef4f0e Add additional parameters for NN Burst -- HAL am: 8414a6ebf9 am: b19c1cbef3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663920

Change-Id: Ie07a7e22e17154b31382ccde3178afa439cc42a0
2021-04-05 22:17:13 +00:00
Michael Butler
0f10ee9eb3 Add missing validation for NN canonical types am: 388bcebc8f am: 2f59ea0610
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663919

Change-Id: If56450f4660b43770d5ebea5a52f31aaacff6330
2021-04-05 22:17:11 +00:00
Michael Butler
b19c1cbef3 Add additional parameters for NN Burst -- HAL am: 8414a6ebf9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663920

Change-Id: If42779032ff2e6aa617c14a1f3e21379958eee05
2021-04-05 21:36:05 +00:00
Michael Butler
2f59ea0610 Add missing validation for NN canonical types am: 388bcebc8f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663919

Change-Id: Iab78bc898b2727be5000c9df2a4e52a1dd03345e
2021-04-05 21:35:29 +00:00
Michael Butler
8414a6ebf9 Add additional parameters for NN Burst -- HAL
Adds deadline and loopTimeoutDuration to nn::IBurst::execute.

This CL additionally adds a test case for
IPreparedModel::configureExecutionBurst and adds the suffix "_H" to
the header guards that were missing "_H".

Bug: 180492058
Bug: 177267324
Test: mma
Test: NeuralNetworksTest_static
Change-Id: Ic9ba2fb9b4dee4e40d99ae91bb9555a58d0508d2
Merged-In: Ic9ba2fb9b4dee4e40d99ae91bb9555a58d0508d2
(cherry picked from commit bbbdb0d5f1)
2021-04-02 22:02:38 -07:00
Michael Butler
388bcebc8f Add missing validation for NN canonical types
Bug: 177669661
Test: mma
Test: NeuralNetworksTest_static
Change-Id: Ic05c177f61a906a69bf82ff9c4d5bb8b0556d5ca
Merged-In: Ic05c177f61a906a69bf82ff9c4d5bb8b0556d5ca
(cherry picked from commit 08ee3f9287)
2021-04-02 22:02:02 -07:00
Xusong Wang
cc57258fee Rename BufferRole.frequency -> probability -- HAL. am: 3633d07092 am: 876c290465
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663160

Change-Id: I723c1dad41d9e883a5fdca8ddb4586a0a4174b3e
2021-04-02 21:49:52 +00:00
Xusong Wang
876c290465 Rename BufferRole.frequency -> probability -- HAL. am: 3633d07092
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663160

Change-Id: I136573a127b5cd81fd2f5bd022ca40feaad51638
2021-04-02 21:08:56 +00:00
Myles Watson
f8cfd25b39 Merge "VtsBluetooth: Use ASSERT_* to end the test ASAP" am: 21927e2ddd am: a2a17c091f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662559

Change-Id: I54fe92a255db7e827e091a39456de51a61dd7bfe
2021-04-02 18:58:05 +00:00
Myles Watson
a2a17c091f Merge "VtsBluetooth: Use ASSERT_* to end the test ASAP" am: 21927e2ddd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662559

Change-Id: Icf35c27fe317df9e44aedd92b060fb96564c9d5a
2021-04-02 18:21:07 +00:00
Xusong Wang
3633d07092 Rename BufferRole.frequency -> probability -- HAL.
"Frenquency" often refers to the number of occurrences over a period of
time, while "probability" refers to the number of occurrences of one
event over the number of occurrences of all events. "Probability" is a
better name for this field.

Fixes: 183117895
Test: VtsHalNeuralnetworksTargetTest
Test: NNT_static
Change-Id: Ic86f73b8be2aed567ae4ca17bdb3a57c658fb349
Merged-In: Ic86f73b8be2aed567ae4ca17bdb3a57c658fb349
(cherry picked from commit 46bf892f46)
2021-04-02 10:26:29 -07:00
Myles Watson
21927e2ddd Merge "VtsBluetooth: Use ASSERT_* to end the test ASAP" 2021-04-02 16:36:16 +00:00
Treehugger Robot
05d94afeba Merge "Allow SecureClock tests to pass on devices w/out SecureClock" am: 1a9bbebbca am: d7b3a20f25
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662902

Change-Id: I21fc54e73f35c7ca573f69ef842cc50521337337
2021-04-02 16:10:33 +00:00
Shawn Willden
1b5bf4a339 Merge "Allow KeyMint tests to pass on devices w/out KeyMint" am: d7f1c1d638 am: 1da5562f93
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662901

Change-Id: Iab23fbab7c1c37e7e50abe426d6cba02c163a35c
2021-04-02 16:10:29 +00:00
Shawn Willden
fa5c497e56 Merge "Correct error code in attest_key docs." am: b21b4a3663 am: 741884a363
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662620

Change-Id: I728cc24ae0d0bb6deb26b8e1fd4008668a5bc30b
2021-04-02 16:10:19 +00:00
Treehugger Robot
d7b3a20f25 Merge "Allow SecureClock tests to pass on devices w/out SecureClock" am: 1a9bbebbca
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662902

Change-Id: Ie4f4d2503d77764a0912cdcf39f872b387cb1534
2021-04-02 15:25:16 +00:00
Shawn Willden
1da5562f93 Merge "Allow KeyMint tests to pass on devices w/out KeyMint" am: d7f1c1d638
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662901

Change-Id: I9ab8ff2be49db4e2946e74e6dfd7c196bd4687dd
2021-04-02 15:25:07 +00:00
Shawn Willden
741884a363 Merge "Correct error code in attest_key docs." am: b21b4a3663
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662620

Change-Id: Ia0f1df2713a35026bcd89bd4fac72aead650146b
2021-04-02 15:24:26 +00:00
Treehugger Robot
1a9bbebbca Merge "Allow SecureClock tests to pass on devices w/out SecureClock" 2021-04-02 14:51:49 +00:00
Shawn Willden
d7f1c1d638 Merge "Allow KeyMint tests to pass on devices w/out KeyMint" 2021-04-02 14:44:42 +00:00
Shawn Willden
b21b4a3663 Merge "Correct error code in attest_key docs." 2021-04-02 14:44:16 +00:00
Benjamin Schwartz
931e1e1dc0 power/stats: Index the state residency data providers am: 3bad122962 am: 82a8c67415
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663119

Change-Id: Iff6ede9bcdd6b877b1b85b173a038d369a6a3429
2021-04-02 06:51:34 +00:00
Benjamin Schwartz
82a8c67415 power/stats: Index the state residency data providers am: 3bad122962
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663119

Change-Id: Ie15a72e82306e08208f5c3ffc9d49599a8bb8884
2021-04-02 06:06:43 +00:00
Benjamin Schwartz
3bad122962 power/stats: Index the state residency data providers
Data providers that provided data for multiple entities were being added
to the data structure as nullptr due to move semantics. Now they will
only be added once (ensuring no more nullptr entries) and an index will
map each power entity id to its corresponding data provider.

Bug: 184290936
Test: Presubmit
Change-Id: I858269beb36ba5f87bb14a228079f3abd6c2332f
2021-04-01 18:26:38 -07:00
Steven Moreland
93c8494596 light: downgrade hardware open error am: 7af6d0fecc am: 7c314eed3d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662759

Change-Id: Iaebc23fa1970cb5840484b01f172b8e4e6e423fb
2021-04-02 00:06:58 +00:00
Steven Moreland
7c314eed3d light: downgrade hardware open error am: 7af6d0fecc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662759

Change-Id: I48c6332af23bfa1b83e5f84b43b3b858e50a482c
2021-04-01 23:20:41 +00:00
Shawn Willden
14fdd67a30 Allow SecureClock tests to pass on devices w/out SecureClock
Bug: 182289099
Test: VtsAidlSecureClockTargetTest
Change-Id: I830fe2879cd3328adf950060afb7e9eb18e558b7
2021-04-01 17:06:06 -06:00
Shawn Willden
7e71f1e5c5 Allow KeyMint tests to pass on devices w/out KeyMint
Bug: 181987225
Test: VtsAidlKeyMintTargetTest
Change-Id: I243fee463611ec2bf1f3661c46d3431280e187aa
2021-04-01 16:44:22 -06:00
Steven Moreland
7af6d0fecc light: downgrade hardware open error
If a certain type of light isn't available, we want to indicate this,
but it isn't an error.

Bug: N/A (was asked to do this for some fixit)
Test: N/A
Change-Id: I69038964db22425a7e9b2c722ddd4f38bf5bea2e
2021-04-01 20:50:51 +00:00
Shawn Willden
7bbf6298f2 Correct error code in attest_key docs.
Also adds a test to verify that implementations return the expected
error code.

Test: VtsAidlKeyMintTargetTest
Change-Id: Ic8e9953a2572eb0cc8fefc363934eaf9b432b5a4
2021-04-01 12:57:21 -06:00
Myles Watson
244ad3663f VtsBluetooth: Use ASSERT_* to end the test ASAP
Bug: 181133988
Change-Id: I19807685e0330196a4309e5c3d1183f37911bdd5
Test: atest VtsHalBluetoothV1_0TargetTest
Tag: #test-stability
2021-04-01 11:05:09 -07:00
Shawn Willden
d54b502de0 Merge "Fix documentation of EARLY_BOOT_ONLY tag in KeyMint" am: 49e5b5eacc am: 3362fae7c3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1650387

Change-Id: I33933ae734012262bfcb32a96be0c7f37b8f3813
2021-04-01 15:46:55 +00:00
Shawn Willden
3362fae7c3 Merge "Fix documentation of EARLY_BOOT_ONLY tag in KeyMint" am: 49e5b5eacc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1650387

Change-Id: I2667024b9db2ab5a730d82daabba51580f464e19
2021-04-01 15:01:45 +00:00
Shawn Willden
49e5b5eacc Merge "Fix documentation of EARLY_BOOT_ONLY tag in KeyMint" 2021-04-01 14:36:07 +00:00
David Drysdale
e8d2915ffc Merge changes I390aa702,I9084343c am: 0c77e4d25a am: 35f97c33b6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1660162

Change-Id: If89769d48bcb14713a84d92611bc38894cdccb49
2021-04-01 06:52:06 +00:00
David Drysdale
35f97c33b6 Merge changes I390aa702,I9084343c am: 0c77e4d25a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1660162

Change-Id: I1496525e836e6b669e6074effe862457fd85420e
2021-04-01 06:12:49 +00:00
David Drysdale
0c77e4d25a Merge changes I390aa702,I9084343c
* changes:
  Use a heuristic to correlate devices
  Fix DeviceInfo encoding and checks
2021-04-01 05:43:28 +00:00
Treehugger Robot
456ef47b8e Merge "audio: Use get_audio_port_v7 in the default wrapper" am: 6f219a694c am: f2f027f403
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1661038

Change-Id: I8424299b15538ecc4df587088773fe1ae7bb3de4
2021-03-31 21:33:43 +00:00
Treehugger Robot
f2f027f403 Merge "audio: Use get_audio_port_v7 in the default wrapper" am: 6f219a694c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1661038

Change-Id: I3e64b266b49ea86bbcedf1a683b2417b5fa86ce1
2021-03-31 20:53:03 +00:00
Michael Butler
a89d08fdc4 Merge "Add std::this_thread::yield to Burst NN polling loop" am: 6aab5a161e am: 7efe947159
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1659697

Change-Id: I5f8d4ef3af3c4eb8ce816af17ffea0170d875ff9
2021-03-31 20:32:53 +00:00
Treehugger Robot
6f219a694c Merge "audio: Use get_audio_port_v7 in the default wrapper" 2021-03-31 20:15:53 +00:00
Michael Butler
7efe947159 Merge "Add std::this_thread::yield to Burst NN polling loop" am: 6aab5a161e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1659697

Change-Id: I235ef3271adf0ee385189f654997a767f9589633
2021-03-31 19:56:16 +00:00
Michael Butler
6aab5a161e Merge "Add std::this_thread::yield to Burst NN polling loop" 2021-03-31 18:40:54 +00:00
Mikhail Naganov
cb766d2517 audio: Use get_audio_port_v7 in the default wrapper
get_audio_port_v7 interface method was added in aosp/1518624
but wasn't used in the default wrapper due to the refactoring
ongoing at that time. Fixing this omission.

Bug: 160352965
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: I1e3594f30fe8fa319d0b5b4244531c9142870503
Merged-In: I1e3594f30fe8fa319d0b5b4244531c9142870503
2021-03-31 18:24:11 +00:00
David Drysdale
4d3c298c66 Use a heuristic to correlate devices
Every KeyMint device should have a corresponding
IRemotelyProvisionedComponent instance, but the converse is not true.

So given an IRPC instance under test, look for a corresponding KeyMint
device by comparing suffixes, but just skip the test if not found.

Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I390aa7025eb77f75a3280e8d85dc453b784c23ee
2021-03-31 18:27:36 +01:00
David Drysdale
f6fc5a6336 Fix DeviceInfo encoding and checks
- Make the default implementation include the DeviceInfo as a map, not
   a bstr-holding-a-map, to match the spec.
 - Check the signature of the signed MAC even in test mode.
 - Include the DeviceInfo in the data that the signature covers.

Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I9084343c1273c16a9cbd5a1156e7057a1c54a860
2021-03-31 18:08:59 +01:00
David Drysdale
ab9655adc7 Merge changes I2f5187bf,Icb79e1e0,I833894d3,I54dcaa61,I47a810f2 am: b39baeaa92 am: 319cf92322
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1650253

Change-Id: I06d157bc36c44733817f890331acfe50152f7df3
2021-03-31 16:01:35 +00:00
David Drysdale
319cf92322 Merge changes I2f5187bf,Icb79e1e0,I833894d3,I54dcaa61,I47a810f2 am: b39baeaa92
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1650253

Change-Id: I49d546f84e6082527b3320e5cf9ab3bfc629d0d8
2021-03-31 15:22:38 +00:00
David Drysdale
b39baeaa92 Merge changes I2f5187bf,Icb79e1e0,I833894d3,I54dcaa61,I47a810f2
* changes:
  Test that provisioned keys can be used with KeyMint
  Add tests with corrupted MAC on keypair
  Add more EEK variant tests and related fixes
  Commonize MacedPublicKey and ProtectedData checks
  Tweak IRemotelyProvisionedComponent AIDL docs
2021-03-31 14:48:41 +00:00
David Zeuthen
0f54cb03c0 Merge "identity: add TEST_MAPPING file to run CTS, VTS, and unit tests in presubmit." am: ae33614d00 am: 16454f9854
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1650507

Change-Id: Ibd7be61e57309cceec85c1de7f4dd7f075bd2502
2021-03-31 14:45:44 +00:00