Commit Graph

29453 Commits

Author SHA1 Message Date
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
Michael Butler
9c1b7cacfb Merge "Create unit tests for NN interface utility code" 2021-01-07 01:15:10 +00: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
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
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
TreeHugger Robot
22e01689c2 Merge changes from topic "contexthub_hal_update"
* changes:
  Add new contexthub HAL 1.2 methods to default impl
  Add stubs for new contexthub v1.2 methods
  Update Contexthub HAL 1.2
2021-01-05 14:46:26 +00:00
samou
0eb468d82d power/stats: Add EnergyConsumerAttribution interface
Bug: 172576334
Test: build pass
Change-Id: I4a02a3cb9a20bd371cf1c0bf0c891eecb0283fbe
2021-01-05 00:33:19 +00:00
Eric Laurent
74f0eda6ad Merge "audio HAL V7: Update track metadata" 2021-01-04 15:57:09 +00:00
TreeHugger Robot
4272b7de0e Merge "Revert "Add emergencyDial_1_6 in the HAL to modify the multisim ..."" 2020-12-30 18:26:49 +00:00
Yi-yo Chiang
3ea060eb6d Revert "Add emergencyDial_1_6 in the HAL to modify the multisim ..."
Revert "Add cuttilefish implementation for emergencyDial_1_6"

Revert submission 13164522-emergencyDial_1_6

Reason for revert: Potential culprit of b/176519828

Reverted Changes:
I3680b8d42:Add cuttilefish implementation for emergencyDial_1...
I94319ab34:Add emergencyDial_1_6 in the HAL to modify the mul...

Change-Id: I17e59676b6467b8b51dcb839497883a2c89ee50d
2020-12-30 07:34:58 +00:00
Shuo Qian
02dfb3dcb4 Merge "Add emergencyDial_1_6 in the HAL to modify the multisim logic for pin lock" 2020-12-30 00:08:53 +00:00
Michael Butler
a1cf32e23f [automerger skipped] Merge changes from topic "nnapi-timings" am: 8f583928c7 am: ae447b1a84 am: 2be17732e7 -s ours
am skip reason: Change-Id Icf37d05c884c740178324fcd046ea56914ef7d44 with SHA-1 11761e37a8 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534941

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e2dd67380d8485e4a3db69f580c0e534a7e3a74
2020-12-29 23:00:36 +00:00
Michael Butler
a8f0e18049 [automerger skipped] Cleanup NN callback error handling am: 7fd03c265e am: fba38351e5 am: dc4b50c2e1 -s ours
am skip reason: Change-Id I62714a932e71dfc77401bbcb9eaaaf3d94fb9707 with SHA-1 98ed9baf5d is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534940

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a574775cecb5ce0c32a7b40fad3bba1d161ee2d
2020-12-29 23:00:34 +00:00
Michael Butler
6f7481c6e6 [automerger skipped] Add HIDL lifetime and protecting callback info to NN README am: aad934baa7 am: c9b2587de9 am: d761a36c66 -s ours
am skip reason: Change-Id Id381895535d708b627f4746687b4d12e16560639 with SHA-1 7a655bb3d4 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2854b257061ce0af201cb122706686b28772e08
2020-12-29 23:00:33 +00:00
Michael Butler
d0ac2c3dcb [automerger skipped] Change NN canonical timings to nanoseconds -- hal am: 4024d8f4d8 am: 004a3b37b1 am: 944b678ce4 -s ours
am skip reason: Change-Id If44d9aefadb2c78b632ff289b5ff5a49f766525c with SHA-1 ca11420785 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534938

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21ed546e33b624345e830462c5f3339361771717
2020-12-29 23:00:31 +00:00
Michael Butler
2be17732e7 Merge changes from topic "nnapi-timings" am: 8f583928c7 am: ae447b1a84
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534941

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d75b99442dfabd84768556844b3010b35a9b768
2020-12-29 22:31:54 +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
5562342428 Merge "Move utcTime in default implementation forward" 2020-12-29 02:32:19 +00:00
Yu-Han Yang
bcf3b22fba Move utcTime in default implementation forward
Bug: 175890761
Test: atest GnssLocationUpdateIntervalTest#testLocationUpdatesAtVariousIntervals
Change-Id: Iab572243fc8cbf2f34df0b45614050ad794af384
2020-12-28 13:34:22 -08:00
Treehugger Robot
5ef7bb5a1c Merge "Audio: Fix automatic version replacement in IStreamOutEventCallback.hal" am: 85959e1682 am: e86f94f7f6 am: ff8a37351f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id19c9d873bfa3230581b15ade8ac0ae7a4777eb7
2020-12-28 21:23:00 +00:00
Treehugger Robot
ff8a37351f Merge "Audio: Fix automatic version replacement in IStreamOutEventCallback.hal" am: 85959e1682 am: e86f94f7f6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00e9f280a5dfba734a9f5bf77def60d7643b0e89
2020-12-28 21:07:52 +00:00
Shuo Qian
84b7069ab7 Add emergencyDial_1_6 in the HAL to modify the multisim logic for pin lock
Test: vts
Bug: 171235919
Change-Id: I94319ab345dabae040792b14b2f8bd8bc64839c0
2020-12-28 12:44:55 -08: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
Marin Shalamanov
2c05bb003a VTS: Test that configs in a group differ only by vsync period am: 6f36dd6e31 am: e834cea452 am: 7f31d5fda4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533539

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf4d83b6fee875da9d5a15e334b0b691a676752d
2020-12-28 20:36:01 +00:00
Marin Shalamanov
7f31d5fda4 VTS: Test that configs in a group differ only by vsync period am: 6f36dd6e31 am: e834cea452
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533539

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0000674bc1b682648aae9e6febd789f3084742c
2020-12-28 20:15: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
8ffdb30eee Merge "Update documentation for secondary bandwidth" 2020-12-24 00:20:08 +00:00