Commit Graph

26954 Commits

Author SHA1 Message Date
Mikhail Naganov
45e6ec48c9 Audio: Add VTS tests for invalid enum-strings, Part 1b am: 9139399bad
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1543608

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06e23b9ae40a078f88ffdbe6ac7bd47a76787576
2021-01-08 09:53:47 +00:00
Mikhail Naganov
9139399bad Audio: Add VTS tests for invalid enum-strings, Part 1b
Add missing checks for invalid channel mask and tags
in playback and record metadata. Fix the behavior of
the default wrapper.

Bug: 142480271
Test: atest VtsHalAudioV6_0TargetTest
Test: atest VtsHalAudioV7_0TargetTest
      with side-loaded V7 default wrapper
Change-Id: Ie0f82b2becc457b735349eb351ea29989a64f22c
2021-01-07 18:35:11 -08:00
Mikhail Naganov
d5e5b72c96 Merge "Audio: Add VTS tests for invalid enum-strings, Part 1" am: 254903f8fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1535386

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4105219c3073101cde164812b569f54aa6afbd2f
2021-01-08 00:29:32 +00:00
Mikhail Naganov
254903f8fd Merge "Audio: Add VTS tests for invalid enum-strings, Part 1" 2021-01-08 00:14:42 +00:00
David Zeuthen
c0d021c5da Merge "Identity Credential: Switch default implementation to use libeic." am: 8f4cc703f9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1245367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia45caf741fde9e0dafd2d21acd9e5abe60146bf9
2021-01-07 23:15:43 +00:00
David Zeuthen
8f4cc703f9 Merge "Identity Credential: Switch default implementation to use libeic." 2021-01-07 22:58:50 +00:00
Treehugger Robot
8d00d73467 Merge "audio HAL V7: Update track metadata" am: 88a2210fc4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1541462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6edea101fcb7dd223ef699ba58cdae81680cb0e
2021-01-07 22:07:02 +00:00
Treehugger Robot
88a2210fc4 Merge "audio HAL V7: Update track metadata" 2021-01-07 21:52:06 +00:00
Yifan Hong
720304b490 Update AIDL IVibrator manifest version to 2. am: add7761be6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540633

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bd614e7a277f38c908a646ee74e22dba39428ce
2021-01-07 21:44:39 +00:00
Yifan Hong
954fad1da6 matrix: IVibrator AIDL has version 2. am: 355f0ceabd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540632

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa42de842ce214514d24efb5da30dacf9ab2c00e
2021-01-07 21:43:53 +00:00
Yifan Hong
87f34dc550 Update AIDL identity manifest version to 2. am: af89f5efca
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540631

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ef369e7fdc237c7170fa91efe08f8af7c844353
2021-01-07 19:19:33 +00:00
Yifan Hong
8d8f8ba4b7 matrix: identity AIDL has version 2. am: d86a89c53b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540630

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d5d38179410f290fc68cc6a6c6d4997458b996c
2021-01-07 19:19:01 +00:00
Mikhail Naganov
3f1457b953 Audio: Add VTS tests for invalid enum-strings, Part 1
Add tests that try passing invalid enum-string values to HAL
methods taking enum-strings. Fix issues found in the default
wrapper.

Interface updates:

- Update AudioConfig structure to indicate whether
  AudioOffloadInfo is specified.

- Add return value to IStreamIn.updateSinkMetadata
  and IStreamOut.updateSourceMetadata to provide indication
  of invalid arguments.

- Specify the behavior of IDevice.open{Input|Output}Stream
  in the case of invalid arguments vs. rejected config.

Bug: 142480271
Test: atest VtsHalAudioV6_0TargetTest
Test: atest VtsHalAudioV7_0TargetTest
      with side-loaded V7 default wrapper
Change-Id: I6bd7be3869cc7a8d5d00506565bbf0b3a050b630
2021-01-07 10:32:06 -08:00
Yifan Hong
add7761be6 Update AIDL IVibrator manifest version to 2.
Test: vts_treble_vintf_test
Bug: 150034914
Change-Id: I418cd4fc5323bb785e42b9e47ec6c0d2bb449975
2021-01-06 16:31:39 -08:00
Yifan Hong
355f0ceabd matrix: IVibrator AIDL has version 2.
Test: builds
Bug: 150034914
Change-Id: I08b4b189dbf811ee866a9fbc3f0f207e19e8f764
2021-01-06 16:31:39 -08:00
Yifan Hong
af89f5efca Update AIDL identity manifest version to 2.
Test: vts_treble_vintf_test
Bug: 150034914
Change-Id: I1f31aa015af61845855f7985188267fc35d29c1e
2021-01-06 16:31:39 -08:00
Yifan Hong
d86a89c53b matrix: identity AIDL has version 2.
Test: builds
Bug: 150034914
Change-Id: I041cc5c1dfb7b812d38a7a516276630d2f804875
2021-01-06 16:31:39 -08:00
Sam Saccone
11b20638d1 Merge "Android S: deprecate android.hardware.vr." am: 55ac62f92d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcf8ff398a967760f14cd9a0e23be7518db7fee3
2021-01-06 20:01:22 +00:00
Sam Saccone
55ac62f92d Merge "Android S: deprecate android.hardware.vr." 2021-01-06 19:39:20 +00:00
Steven Moreland
7250fba9b4 Android S: deprecate android.hardware.vr.
This HAL is no longer needed/used.

Fixes: 176826409
Test: build (checks manifests)
Change-Id: I1437a40ecce688bf67b3cbca7d3a8b549bf20f69
2021-01-06 02:10:46 +00:00
David Zeuthen
630de2a93e Identity Credential: Switch default implementation to use libeic.
Introduce platform-neutral C library ("libeic") which can be used to
implement an Identity Credential Trusted Application/Applet in Secure
Hardware.

The libeic library is intentionally low-level, has no dependencies
(not even libc), uses very little run-time memory (less than 500 bytes
during a provisioning or presentation session), and doesn't
dynamically allocate any memory. Crypto routines are provided by the
library user through a simple crypto interface defined in EicOps.

Also provide an Android-side HAL implementation designed to
communicate with libeic running in Secure Hardware outside
Android. Abstract out communications between HAL and TA in a couple of
SecureHardwareProxy* classes which mimic libeic 1:1.

The default implementation of the HAL is a combination of the
aforementioned HAL using libeic in-process backed by BoringSSL for the
crypto bits.

Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Bug: 170146643
Change-Id: I3bf43fa7fd9362f94023052591801f2094a04607
2021-01-05 18:30:59 -05:00
Eric Laurent
daedb0dc2e audio HAL V7: Update track metadata
Add channel mask and audio attributes tags to playback
and record track metadata sent to audio HAL.

The legacy HAL wrapper supports older legacy HAL versions
by sending partial metadata when the legay HAL version is
less than 3.2.

Bug: 168751366
Test: make
Change-Id: Iba3ee3b669e4300201374d4a0d5cf45a04872274
Merged-In: Iba3ee3b669e4300201374d4a0d5cf45a04872274
2021-01-05 12:50:40 -08:00
David Zeuthen
5e5edfeb58 Merge "Add support and VTS test for RSA OAEP MGF1." am: 1908606054
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib83d2c9efb5d3e10eb0bb3647b55377a480dc37b
2021-01-05 16:51:41 +00:00
David Zeuthen
1908606054 Merge "Add support and VTS test for RSA OAEP MGF1." 2021-01-05 16:31:02 +00:00
Michael Butler
ae447b1a84 Merge changes from topic "nnapi-timings" am: 8f583928c7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534941

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e7a700d2e1431b1ce4d04ceb92157597fa5515b
2020-12-29 22:09:26 +00:00
Michael Butler
fba38351e5 Cleanup NN callback error handling am: 7fd03c265e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534940

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43a46c563a91851777bc0ef55949eb5c25eb5f9c
2020-12-29 22:09:23 +00:00
Michael Butler
c9b2587de9 Add HIDL lifetime and protecting callback info to NN README am: aad934baa7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93a4969d22a4808ea4f20f945997b7e54507dcee
2020-12-29 22:09:19 +00:00
Michael Butler
004a3b37b1 Change NN canonical timings to nanoseconds -- hal am: 4024d8f4d8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534938

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7869f1d98e0aaa4c04a0160714e19d319417a1dc
2020-12-29 22:08:28 +00:00
Michael Butler
8f583928c7 Merge changes from topic "nnapi-timings"
* changes:
  Remove 'blocking' param from NN ResilientPreparedModel and *Buffer
  Cleanup NN callback error handling
  Add HIDL lifetime and protecting callback info to NN README
  Change NN canonical timings to nanoseconds -- hal
2020-12-29 21:38:13 +00:00
Treehugger Robot
e86f94f7f6 Merge "Audio: Fix automatic version replacement in IStreamOutEventCallback.hal" am: 85959e1682
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I203ecb79aa6c743ceb3f2c2134b76aa2b63925ac
2020-12-28 20:36:42 +00:00
Treehugger Robot
85959e1682 Merge "Audio: Fix automatic version replacement in IStreamOutEventCallback.hal" 2020-12-28 20:08:24 +00:00
Marin Shalamanov
e834cea452 VTS: Test that configs in a group differ only by vsync period am: 6f36dd6e31
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533539

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic573db3d62c67167c4c9e0ed7a695d8a4da9cf2b
2020-12-28 19:50:15 +00:00
Marin Shalamanov
6f36dd6e31 VTS: Test that configs in a group differ only by vsync period
All display configs in a config group must have the same resolution
and DPI (if DPI attributes are supported by HWC).

Fixes: 172902326
Test: atest VtsHalGraphicsComposerV2_4TargetTest
Change-Id: Id86fe7983a12e33d2d9c3b88ee68d6e18485e87d
2020-12-28 19:35:49 +00:00
Treehugger Robot
a3c74e8e71 Merge "Change KM attestation generation to managed cert type." am: c3c893a522
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1527801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d5ef4c7c56cde622450a0cfed45569d7dad446e
2020-12-23 19:46:00 +00:00
Treehugger Robot
c3c893a522 Merge "Change KM attestation generation to managed cert type." 2020-12-23 18:55:39 +00:00
Treehugger Robot
0df8d23677 Merge "Fix atest VtsAidlKeyMintTargetTest" am: 0347422479
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1535588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa7578c2d581f64466b3b93435b7345bddf69120
2020-12-23 18:40:45 +00:00
Treehugger Robot
0347422479 Merge "Fix atest VtsAidlKeyMintTargetTest" 2020-12-23 18:25:47 +00:00
Shawn Willden
e0b0de5224 Fix atest VtsAidlKeyMintTargetTest
Renaming the test without updating the test configuration broke it.
This fixes it.

Test: atest VtsAidlKeyMintTargetTest
Change-Id: I3f4c07a04f2b0ce604f0bbac43ffdbdbb5b34d53
2020-12-23 09:30:59 -07:00
Kalesh Singh
ee88e0d273 Reland: Memtrack HAL: Add stable AIDL implementation am: a851f3d711
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d4a31c15fda127912be6d8659a7c5d9f44822a1
2020-12-23 01:28:44 +00:00
Mikhail Naganov
d7d258014e Audio: Fix automatic version replacement in IStreamOutEventCallback.hal
The version update script created a typo in the doc string
of IStreamOutEventCallback.

Test: N/A
Change-Id: I331a2781ecb212275d0f8acee33ff49d01714b53
2020-12-22 23:20:57 +00:00
Chirag Pathak
8b7455abb4 Add support and VTS test for RSA OAEP MGF1.
Test: atest VtsAidlKeyMintV1_0TargetTest
Bug: 160968519
Change-Id: I7093b26217b69ea36b4be8837b42cb9446887685
2020-12-22 15:58:52 -05:00
Kalesh Singh
a851f3d711 Reland: Memtrack HAL: Add stable AIDL implementation
Bug: 175021432
Test: adb shell dumpsys -l | grep android.hardware.memtrack.IMemtrack
Test: VtsHalMemtrackTargetTest
Change-Id: I686c0ecc31648dc6e58a6ab5e6ae914454111200
2020-12-22 20:49:35 +00:00
Shawn Willden
659f996a5d Change KM attestation generation to managed cert type.
Bug: 171846199
Test: atest VtsHalIdentityTargetTest
Change-Id: I03c55f74a21d24b3db8460b85816a4da5939c4ed
2020-12-22 15:11:01 +00:00
Michael Butler
bf59946c61 Remove 'blocking' param from NN ResilientPreparedModel and *Buffer
This change removes the 'blocking' parameter for the
ResilientPreparedModel::Factory and ResilientBuffer::Factory. The
'blocking' parameter is only useful for ResilientDevice::Factory, which
behind the scenes chooses between the HIDL calls IDevice::getService and
IDevice::tryGetService. The equivalent calls for IPreparedModel and
IBuffer are not used, as both are created from the IDevice object.

This change also modifies the ResilientDevice's device recovery
behavior. Prior to this change, ResilientDevice's recovery mechanism had
the following behavior:
* attempt to call a function
* if the function did not return a DEAD_OBJECT error, return
* if the function returned a DEAD_OBJECT error, attempt to recover the
  device
* whether or not the recovery succeeded, call the function again

This CL changes the behavior so that if device recovery fails,
ResilientDevice will not call the function the second time.

Bug: N/A
Test: mma
Change-Id: Icf37d05c884c740178324fcd046ea56914ef7d44
Merged-In: Icf37d05c884c740178324fcd046ea56914ef7d44
(cherry picked from commit 11761e37a8)
2020-12-21 21:09:56 -08:00
Michael Butler
7fd03c265e Cleanup NN callback error handling
This CL introduces a new templated class CallbackValue to handle HIDL
"return value" callbacks in a terser and more readable way.

This CL also introduces a new macro HANDLE_HAL_STATUS to return from the
current function when an error is present with the ability to append a
more descriptive error message.

Finally, this CL changes the behavior of synchronous executions. Prior
to this CL, IPreparedModel fell back to an asynchronous execution if the
synchronous execution was allowed and failed. This change instead
returns a failure if synchronous execution is allowed and fails.

Bug: 173084343
Test: mma
Change-Id: I62714a932e71dfc77401bbcb9eaaaf3d94fb9707
Merged-In: I62714a932e71dfc77401bbcb9eaaaf3d94fb9707
(cherry picked from commit 98ed9baf5d)
2020-12-21 21:09:37 -08:00
Michael Butler
aad934baa7 Add HIDL lifetime and protecting callback info to NN README
This CL copies information from
packages/modules/NeuralNetworks/runtime/VersionedInterfaces.cpp and
modifies the description to be more appropriate for the NN HAL utility
code.

Specific sections added to the README:
* "HIDL Interface Lifetimes across Processes"
* "Protecting Asynchronous Calls across HIDL"

Bug: 170289677
Test: mma
Change-Id: Id381895535d708b627f4746687b4d12e16560639
Merged-In: Id381895535d708b627f4746687b4d12e16560639
(cherry picked from commit 7a655bb3d4)
2020-12-21 21:09:14 -08:00
Michael Butler
4024d8f4d8 Change NN canonical timings to nanoseconds -- hal
A sibling CL to this CL changes the definition of nn::TimePoint to the
same type as std::chrono::steady_clock::time_point but has changed the
underlying duration representation to use uint64_t. That sibling CL also
renames nn::OptionalTimeoutDuration to nn::OptionalDuration, and changes
the definition to the same type as std::nanoseconds except the
underlying duration representation now uses uint64_t.

This CL makes changes to the NN HAL utility code in response to the
changes in the sibling CL.

Bug: 174297663
Test: mma
Test: NeuralNetworksTest_static
Change-Id: If44d9aefadb2c78b632ff289b5ff5a49f766525c
Merged-In: If44d9aefadb2c78b632ff289b5ff5a49f766525c
(cherry picked from commit ca11420785)
2020-12-21 21:08:43 -08:00
Treehugger Robot
90ea1579e2 Merge "Revise keymint_tags.h" am: 2528ddcab2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a03d4caa6a7641ede077511a3cc6da7e55475bd
2020-12-21 18:41:30 +00:00
Treehugger Robot
268ef54b1a Merge "Change KeyParameters to use a union." am: d389d1659a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520082

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4e01b51cd86c965b5869bcf26fba95e9a74465a
2020-12-21 18:37:15 +00:00
Treehugger Robot
2528ddcab2 Merge "Revise keymint_tags.h" 2020-12-21 18:11:08 +00:00