Commit Graph

26976 Commits

Author SHA1 Message Date
Treehugger Robot
0d3433a346 Merge "Fixed incorrect retry timer value type" am: a3cc90b1c3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1543612

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a75c34a8df9781765775f2de61a9ccc955bd6f3
2021-01-11 19:55:20 +00:00
Treehugger Robot
a3cc90b1c3 Merge "Fixed incorrect retry timer value type" 2021-01-11 18:54:53 +00:00
Michael Butler
53da7727b4 Merge changes I2c79865b,Idfe8093c am: 8be4b590cf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1544546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff929729f915c29e6eaa72c254766bc1b71faac4
2021-01-11 18:35:34 +00:00
Michael Butler
ade46f92f8 Add recovery code to NN ResilientPreparedModel and *Buffer am: 418c749746
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1544545

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8eb2bb5a0f597d36a57fcf278c5bfab22b4abe4
2021-01-11 18:35:03 +00:00
Michael Butler
8be4b590cf Merge changes I2c79865b,Idfe8093c
* changes:
  Create unit tests for NN interface utility code
  Add recovery code to NN ResilientPreparedModel and *Buffer
2021-01-11 18:20:41 +00:00
ChengYou Ho
03375181de Add oemlock AIDL interface am: 109522c0d1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1542664

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ec959e1fc280c88fb2b66075eafed876a04556c
2021-01-11 06:25:33 +00:00
ChengYou Ho
109522c0d1 Add oemlock AIDL interface
Bug: 176107318
Change-Id: Ibcf0934f7a86379318ef55ad2117c9be3200b629
2021-01-09 08:13:53 +08:00
Treehugger Robot
9727575946 Merge changes from topic "revert-1540633-DNRXHDZSUB" am: f504e514c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1544644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0e156c24939baca97eb1923767e709f9166f2fc
2021-01-08 23:24:02 +00:00
Treehugger Robot
f504e514c4 Merge changes from topic "revert-1540633-DNRXHDZSUB"
* changes:
  Revert "matrix: IVibrator AIDL has version 2."
  Revert "Update AIDL IVibrator manifest version to 2."
2021-01-08 23:03:01 +00:00
Amos Bianchi
db670b93a3 Merge "Add method for testing lazy HALs active services count callback." am: 88c14d2b14
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1538301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32ff0a5a2754ee4840a88b89c07c2c8a532a7c9d
2021-01-08 22:08:45 +00:00
Amos Bianchi
88c14d2b14 Merge "Add method for testing lazy HALs active services count callback." 2021-01-08 21:30:45 +00:00
Yifan Hong
6135189a29 Revert "matrix: IVibrator AIDL has version 2."
Revert submission 1540633

Reason for revert: AOSP not updated yet
Reverted Changes:
I418cd4fc5:Update AIDL IVibrator manifest version to 2.
I08b4b189d:matrix: IVibrator AIDL has version 2.

Change-Id: I429faacf309aa61aa044d72b873e23ba25ed5bca
2021-01-08 21:09:18 +00:00
Yifan Hong
9e8fe956f6 Revert "Update AIDL IVibrator manifest version to 2."
Revert submission 1540633

Reason for revert: AOSP not updated yet
Reverted Changes:
I418cd4fc5:Update AIDL IVibrator manifest version to 2.
I08b4b189d:matrix: IVibrator AIDL has version 2.

Change-Id: I1cc5ab201e079a09c4db2667207c856ff56b0988
2021-01-08 21:09:18 +00:00
Shuo Qian
d803e12ae5 Merge "Skip emergency dialing VTS if device doesn't support radio" am: e0a858b1d5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1542844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09e1ac10aa707fb52ba5d1bc66e4aafe42a2b764
2021-01-08 20:27:18 +00:00
Michael Butler
6e492a62e1 Create unit tests for NN interface utility code
This CL introduces unit tests to validate the V1_X::utils::Device,
*PreparedModel, and *Buffer adapter classes. It does so by mocking the
underlying HIDL interface in order to simulate a driver returning bad
data, HIDL transport failures, and service crashes.

Note that the purpose of these new tests is to validate the adapter
classes themselves, not the HIDL interfaces they use. For example,
because nn::IPreparedModel does not currently define a method for
configuring a burst execution, V1_[23]::utils::PreparedModel similarly
does not use hardware::neuralnetworks::V1_[23]::IPreparedModel's
configureExecutionBurst method.

This CL also introduces unit tests to validate the utils::Resilient*
adapter classes, and mocks DEAD_OBJECT failures to ensure that the
underyling object can be recovered appropriately.

Bug: 163801800
Test: mma
Test: atest neuralnetworks_utils_hal_common_test
Test: atest neuralnetworks_utils_hal_1_[0-3]_test
Change-Id: I2c79865bf666d3f4bf53061ff5090746403583e9
Merged-In: I2c79865bf666d3f4bf53061ff5090746403583e9
(cherry picked from commit afc4d7cfe7)
2021-01-08 12:07:43 -08:00
Michael Butler
418c749746 Add recovery code to NN ResilientPreparedModel and *Buffer
Prior to this CL, ResilientPreparedModel and ResilientBuffer were
passthrough interfaces that just forwarded calls to the underlying
interface object. This CL implements the full recovery mechanism for
these two classes. However, because we do not want to enable this
functionality in the NN runtime yet, ResilientDevice hides the paths
that create ResilientPreparedModel and ResilientBuffer behind an #if
until we want to enable those paths.

Bug: N/A
Test: mma
Change-Id: Idfe8093c63c7ba2f16c995eec872d150696e7a08
Merged-In: Idfe8093c63c7ba2f16c995eec872d150696e7a08
(cherry picked from commit 667dc2dcac)
2021-01-08 12:07:20 -08:00
Shuo Qian
e0a858b1d5 Merge "Skip emergency dialing VTS if device doesn't support radio" 2021-01-08 19:24:47 +00:00
Shawn Willden
75a296e89d Update KM4.1 owners am: e21ce63ba6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1543369

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0dcd7132e16e570da34867ccba17a808967067a
2021-01-08 18:16:14 +00:00
Shawn Willden
e21ce63ba6 Update KM4.1 owners
Change-Id: Ib7e0d3aead2a220c8161d7b4af471116f9ffa93f
2021-01-08 15:57:56 +00:00
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
Jack Yu
fd8ff812b3 Fixed incorrect retry timer value type
Since negative values indicates network did not suggest
data retry timer, the type should be signed instead of
unsigned.

Test: Manual
Fix: 159672248
Change-Id: Ibda126c7db6b7e1fef9323d4b2aace37ca13ebc1
2021-01-07 23:21:46 -08: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
Amos Bianchi
5a58e9bf9b Add method for testing lazy HALs active services count callback.
Bug: 176240491
Test: atest hidl_lazy_test

Change-Id: I2db4fa62fac725fc4943678e0d8aa89c9f411350
2021-01-07 13:44:21 -08: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
Shuo Qian
628a335326 Skip emergency dialing VTS if device doesn't support radio
Test: vts
Bug: 176862267
Change-Id: I9e72ba5cf6cb118cd68f753355f4119d33fe0019
2021-01-07 18:56:25 +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