Mikhail Naganov
ef6aafa210
Merge "Audio: Add VTS tests for invalid enum-strings, Part 1" am: 254903f8fd am: d5e5b72c96 am: 8b85d99104
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1535386
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib942c58f8d92dcec0977f35e48f2a8e7bd462149
2021-01-08 01:27:19 +00:00
Mikhail Naganov
8b85d99104
Merge "Audio: Add VTS tests for invalid enum-strings, Part 1" am: 254903f8fd am: d5e5b72c96
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1535386
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaad637212227062aea074ad7a6b034998cc370b0
2021-01-08 00:54:52 +00: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
70fde89b45
Merge "Identity Credential: Switch default implementation to use libeic." am: 8f4cc703f9 am: c0d021c5da am: bb567cff93
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1245367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib2de4a81b2445fa19a4ddf388e3b5734dad1fd41
2021-01-07 23:48:53 +00:00
David Zeuthen
bb567cff93
Merge "Identity Credential: Switch default implementation to use libeic." am: 8f4cc703f9 am: c0d021c5da
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1245367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73e0f588b558a15a2992e29245b0908f086f0a31
2021-01-07 23:34:24 +00:00
Treehugger Robot
ab2321ed93
[automerger skipped] Merge "audio HAL V7: Update track metadata" am: 88a2210fc4 am: 8d00d73467 am: 535482756e -s ours
...
am skip reason: Change-Id Iba3ee3b669e4300201374d4a0d5cf45a04872274 with SHA-1 deebf381f6 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1541462
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d382ed0558d08b48b4810faaa63798b19bf5abe
2021-01-07 23:20:15 +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
535482756e
Merge "audio HAL V7: Update track metadata" am: 88a2210fc4 am: 8d00d73467
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1541462
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I30116dfdc511cba731cc65c463d829ed5b269b47
2021-01-07 22:52:58 +00:00
Yifan Hong
76fc53b4ba
Update AIDL IVibrator manifest version to 2. am: add7761be6 am: 720304b490 am: 7001e2f055
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540633
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id337789df340730cabcea459cd7dec4a3f7fcf71
2021-01-07 22:35:07 +00:00
Yifan Hong
97fc09be73
matrix: IVibrator AIDL has version 2. am: 355f0ceabd am: 954fad1da6 am: 1d67d04f52
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540632
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf1ef6eda6ea9727564c43a28d8996fec590d70a
2021-01-07 22:35:05 +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
Yifan Hong
7001e2f055
Update AIDL IVibrator manifest version to 2. am: add7761be6 am: 720304b490
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540633
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie74722c276e6ded0ce60b79d444f7aabd57e4abf
2021-01-07 21:58:22 +00:00
Yifan Hong
1d67d04f52
matrix: IVibrator AIDL has version 2. am: 355f0ceabd am: 954fad1da6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540632
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib6863e19724848f7bc8955ab653e24f9ec6d339c
2021-01-07 21:58:20 +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
95d5b9a617
Update AIDL identity manifest version to 2. am: af89f5efca am: 87f34dc550 am: 54bf4ca7da
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540631
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6c90fe1ac0bfda4034a2b53f15894ee369dcb62
2021-01-07 20:10:09 +00:00
Yifan Hong
4ba72f1414
matrix: identity AIDL has version 2. am: d86a89c53b am: 8d8f8ba4b7 am: 61549ef2f2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540630
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2af0c1c1176260244f0b102112db6836aca6b8a4
2021-01-07 20:10:07 +00:00
Yifan Hong
54bf4ca7da
Update AIDL identity manifest version to 2. am: af89f5efca am: 87f34dc550
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540631
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42b684ab7850dc950cc825edf2e89c63a1042a9b
2021-01-07 19:35:41 +00:00
Yifan Hong
61549ef2f2
matrix: identity AIDL has version 2. am: d86a89c53b am: 8d8f8ba4b7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540630
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie4f7ed2b3c81097ef07316e70864b57a5fc5ce6c
2021-01-07 19:35:40 +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
TreeHugger Robot
be136613f4
Merge "wifi: Fix removeIfaceInstanceFromBridgedApIfaceInternal"
2021-01-07 04:57:28 +00:00
TreeHugger Robot
19cd6bf468
Merge changes Idb9156a2,I62d800cb
...
* changes:
Update AIDL IVibratorManager manifest version to 2.
matrix: IVibratorManager AIDL has version 2.
2021-01-07 03:35:48 +00:00
lesl
819e37237a
wifi: Fix removeIfaceInstanceFromBridgedApIfaceInternal
...
Fix the incorrect empty check.
Bug: 162686273
Test: Manual Test, shutdown instance works normally
Change-Id: I44c5c4adcc7a964e25b5fa5e291bb9b9f4932655
2021-01-07 09:49:21 +08:00
Michael Butler
9c1b7cacfb
Merge "Create unit tests for NN interface utility code"
2021-01-07 01:15:10 +00: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
Yifan Hong
f2f8d85cd8
Update AIDL IVibratorManager manifest version to 2.
...
Test: vts_treble_vintf_test
Bug: 150034914
Change-Id: Idb9156a279b2aa942a7772e0e9150bb55aaa23d8
2021-01-06 16:28:49 -08:00
Yifan Hong
b46c41f2fb
matrix: IVibratorManager AIDL has version 2.
...
Test: builds
Bug: 150034914
Change-Id: I62d800cb30f05a77e272d4e67afddfda09accd6e
2021-01-06 16:28:27 -08:00
Michael Butler
afc4d7cfe7
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
2021-01-06 12:40:58 -08:00
Sam Saccone
85f7dbd723
Merge "Android S: deprecate android.hardware.vr." am: 55ac62f92d am: 11b20638d1 am: b9beb9889a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idbdd8f17336343424cd616dc52d6c05e5a4c0b90
2021-01-06 20:40:40 +00:00
Sam Saccone
b9beb9889a
Merge "Android S: deprecate android.hardware.vr." am: 55ac62f92d am: 11b20638d1
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id853123e698f78c801ea69d6fc700880797b7e09
2021-01-06 20:22:40 +00: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
Michael Butler
31bd11da98
Merge "Add recovery code to NN ResilientPreparedModel and *Buffer"
2021-01-06 18:08:35 +00:00
Michael Butler
667dc2dcac
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
2021-01-06 04:54:21 +00:00
Peter Collingbourne
8c5bd61817
Merge "Instead of including wifi_hal.h in the legacy_hal namespace, import the types."
2021-01-06 03:46:12 +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
Peter Collingbourne
78471d9a24
Instead of including wifi_hal.h in the legacy_hal namespace, import the types.
...
Including the header inside a namespace leads to ODR violations,
which are normally benign but can cause problems if we want to use
something like CFI in the wifi HAL.
Change-Id: I80cc854632da7e18e5c208ba9210de44b31abbdb
2021-01-05 12:16:33 -08:00
David Zeuthen
f86c2c3cdf
Merge "Add support and VTS test for RSA OAEP MGF1." am: 1908606054 am: 5e5edfeb58 am: f51241afe8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533662
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If420bbaabc26d7df497ae7bc1199274ca81e5527
2021-01-05 18:00:39 +00:00
Benjamin Schwartz
32f3c77ace
Merge "power/stats: Add EnergyConsumerAttribution interface"
2021-01-05 17:52:41 +00:00
David Zeuthen
f51241afe8
Merge "Add support and VTS test for RSA OAEP MGF1." am: 1908606054 am: 5e5edfeb58
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533662
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie24bbcc6bd2ae4fced108886a2027cf3efe70218
2021-01-05 17:23:50 +00:00