Commit graph

16377 commits

Author SHA1 Message Date
Nick Desaulniers
e6faf9820f Merge "[hardware][interfaces][camera] fix -Wreorder-init-list"
am: 977e274043

Change-Id: Ifc6ba9337a2065ae17a02248523be0613d92f5ea
2019-10-14 17:23:14 -07:00
Treehugger Robot
977e274043 Merge "[hardware][interfaces][camera] fix -Wreorder-init-list" 2019-10-15 00:00:45 +00:00
Amy Zhang
22408e85af Merge changes from topic "pes"
am: 04587692b1

Change-Id: Idcec8afe3cb0a3d02ab4278862b1c623e1b6726b
2019-10-14 13:43:23 -07:00
Amy Zhang
04587692b1 Merge changes from topic "pes"
* changes:
  Adding PES filter functionality to assemble PES data
  Adding filter status tracking logic into Demux default impl
2019-10-14 20:13:46 +00:00
Harpreet \"Eli\" Sangha
473f30d337 Merge "Add Vibrator 1.4 Hashes to current.txt"
am: 9e3a3a1f1c

Change-Id: I5f4dd24d6aebcf830afd1f50f01a55a0d6466388
2019-10-14 11:25:29 -07:00
Treehugger Robot
9e3a3a1f1c Merge "Add Vibrator 1.4 Hashes to current.txt" 2019-10-14 18:07:18 +00:00
Nick Desaulniers
e1e932ea20 [hardware][interfaces][camera] fix -Wreorder-init-list
C++20 will require members in a designated initializer to be in order
unlike C99.

Bug: 139945549
Test: mm
Change-Id: I387d30e993719014da50207c7114b0003b9450c5
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-10-14 11:05:30 -07:00
Harpreet \"Eli\" Sangha
e0525f9572 Add Vibrator 1.4 Hashes to current.txt
Test: Build
Change-Id: I3cf9bcca7e6aab7125b7666c82ac493ee44eec8c
Merged-In: I3cf9bcca7e6aab7125b7666c82ac493ee44eec8c
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-10-15 02:09:58 +09:00
Dan Shi
7626cc8cd5 Merge "Add VtsHalLightV2_0TargetTest and VtsHalNeuralnetworksV1_* to vts-core"
am: 0e1efc568c

Change-Id: Id581beb39ff6af6164e737ad0a739f0023fa611e
2019-10-14 08:52:50 -07:00
Dan Shi
0e1efc568c Merge "Add VtsHalLightV2_0TargetTest and VtsHalNeuralnetworksV1_* to vts-core" 2019-10-14 15:35:48 +00:00
Amy
80d8badd1c Adding PES filter functionality to assemble PES data
Test: manual
Bug: 135709325
Change-Id: I9bbbae88918004201e6d7d5389473b4fd3a0a969
Merged-In: I9bbbae88918004201e6d7d5389473b4fd3a0a969
(cherry picked from commit 1109e9fee2)
2019-10-12 00:09:17 +00:00
Amy
7e4ca874d0 Adding filter status tracking logic into Demux default impl
Test: manual
Bug: 135709325
Change-Id: I2d473c250dc4d87263d5e7004095d144da684223
Merged-In: I2d473c250dc4d87263d5e7004095d144da684223

(cherry picked from commit 7912502053)
2019-10-12 00:08:50 +00:00
Steven Moreland
e382f7629e Merge "Remove libhwbinder/libhidltransport deps"
am: ab017f20cf

Change-Id: Ide1b550117ddd9088be89211db3dcfad08a275cf
2019-10-11 13:54:56 -07:00
Steven Moreland
ab017f20cf Merge "Remove libhwbinder/libhidltransport deps" 2019-10-11 20:19:21 +00:00
Harpreet "Eli" Sangha
d7d06bbbd9 Merge "vibrator: Support Async Callback APIs"
am: 21f3eeb2fe

Change-Id: Iae7f2ed1726fb1b163587861dfde7e3983906c61
2019-10-10 17:43:15 -07:00
Treehugger Robot
21f3eeb2fe Merge "vibrator: Support Async Callback APIs" 2019-10-11 00:35:05 +00:00
Dan Shi
4856370e54 Add VtsHalLightV2_0TargetTest and VtsHalNeuralnetworksV1_* to vts-core
Bug: None
Test: None
Change-Id: I3fbbba0dc283bec2de025f0b743d97ded5874bf9
2019-10-10 13:45:43 -07:00
David Anderson
24f746bbb8 Merge "Add a default implementation and tests of IBootControl 1.1."
am: be192c7b44

Change-Id: Ifd9c4bef2f395d59dcd96b57c47ebce2aef322d8
2019-10-10 12:31:29 -07:00
Janis Danisevskis
24db85e33e Fix UB in class NullOr
am: cf5d7e83fd

Change-Id: I2454d18671088f2509ba7110636a4f754772c965
2019-10-10 12:25:11 -07:00
David Anderson
be192c7b44 Merge "Add a default implementation and tests of IBootControl 1.1." 2019-10-10 19:19:49 +00:00
Janis Danisevskis
cf5d7e83fd Fix UB in class NullOr
NullOr now stores the references a pointers internally. This fixes UB
where the internal reference was initalized by dereferencing nullptr.

Test: Compiles
Bug: 121390225
Change-Id: I2073e5aeac401309aa63b08e05db3c467fab6b69
2019-10-10 09:21:18 -07:00
Lev Proleev
5b33b3e129 Merge "Revert "Increase neuralnetworks compatibility to 1.3""
am: c805505344

Change-Id: I0cf669b1c26b45a6c4465d03f616bbc0c10f4072
2019-10-10 07:20:28 -07:00
Lev Proleev
5af04da4a0 Merge changes from topic "NNAPI v1.3"
am: b8d9568f3d

Change-Id: Ib0c49f4af0d83830b0b568b68efc8df17a94a7a1
2019-10-10 07:20:24 -07:00
Lev Proleev
432f6d1609 Revert "Copy VTS tests from v1.2 to v1.3"
am: 9613b4649b

Change-Id: I55e1032435ccf5372fc59781b84333150c7818e5
2019-10-10 07:20:20 -07:00
Lev Proleev
7973d7dec5 Revert "Modify NNAPI VTS tests to run on version 1.3"
am: 64f9eb4bd5

Change-Id: I21709a4fe6cd46e07d9acf3a0ff1b28572a5d2bc
2019-10-10 07:20:14 -07:00
Lev Proleev
c805505344 Merge "Revert "Increase neuralnetworks compatibility to 1.3"" 2019-10-10 14:06:42 +00:00
Lev Proleev
b8d9568f3d Merge changes from topic "NNAPI v1.3"
* changes:
  Revert "Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType"
  Revert "Copy VTS tests from v1.2 to v1.3"
  Revert "Modify NNAPI VTS tests to run on version 1.3"
2019-10-10 14:06:42 +00:00
Lev Proleev
839ca3c428 Revert "Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType"
This reverts commit bd2b4e78ac.

Reason for revert: the topic breaks git_qt-dev-plus-aosp

Change-Id: Ic72dcbb7ac4ef8e6ed597eb778289b39475f03f8
2019-10-10 14:01:05 +00:00
Lev Proleev
9613b4649b Revert "Copy VTS tests from v1.2 to v1.3"
This reverts commit d0e339e1da.

Reason for revert: the topic breaks git_qt-dev-plus-aosp

Change-Id: I68d31526cc7699b9a6c69a1ccc669fdb7605124e
2019-10-10 13:58:56 +00:00
Lev Proleev
a927c57a86 Revert "Increase neuralnetworks compatibility to 1.3"
This reverts commit 485abc99bc.

Reason for revert: the topic breaks git_qt-dev-plus-aosp

Change-Id: I5449cd84fe3085dd90a5f45c7fb4f13577b8b4f2
2019-10-10 13:54:42 +00:00
Lev Proleev
64f9eb4bd5 Revert "Modify NNAPI VTS tests to run on version 1.3"
This reverts commit 543606fb92.

Reason for revert: the topic breaks git_qt-dev-plus-aosp

Change-Id: I74859bae687d65d344ed7edc617e1a7d086960a1
2019-10-10 13:54:38 +00:00
Lev Proleev
ed0f3469ce Merge changes from topic "NNAPI v1.3"
am: b4ff6258c9

Change-Id: I569f7cc0866b622f0e5e01999a2325c925db87a5
2019-10-10 05:08:52 -07:00
Lev Proleev
74678b4522 Modify NNAPI VTS tests to run on version 1.3
am: 543606fb92

Change-Id: I8bf292652e24fe89318992ca6351489b9b3db61e
2019-10-10 05:08:40 -07:00
Lev Proleev
297720e03f Copy VTS tests from v1.2 to v1.3
am: d0e339e1da

Change-Id: I31218237b1372912e4a02c1f0c20acb182dabbb1
2019-10-10 05:08:24 -07:00
Lev Proleev
427d12bcad Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
am: bd2b4e78ac

Change-Id: Ia10e7459dc59aa9b12509c2a6fb21373be2068f1
2019-10-10 05:08:01 -07:00
Lev Proleev
b4ff6258c9 Merge changes from topic "NNAPI v1.3"
* changes:
  Increase neuralnetworks compatibility to 1.3
  Modify NNAPI VTS tests to run on version 1.3
  Copy VTS tests from v1.2 to v1.3
  Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
2019-10-10 10:25:21 +00:00
Nathan Harold
aad649b8df Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime"
am: 3c8f624724

Change-Id: If856c76531d329e7beac3d0b4902ecf46a7c8b6d
2019-10-09 19:38:49 -07:00
Nathan Harold
3c8f624724 Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime" 2019-10-10 02:18:48 +00:00
David Anderson
0473214d39 Add a default implementation and tests of IBootControl 1.1.
Bug: 138861550
Test: VtsHalBootV1_0TargetTest
      VtsHalBootV1_1TargetTest

Change-Id: I53ea2465612b03435c37c3b4edeaff72c368373b
2019-10-09 17:50:30 -07:00
Steven Moreland
36c9ae7c5e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: Ifabf28bbcfa60f8c1786256ef44dff442af99989
Merged-In: I878a4d04e65ef13f3a0ebaf64177f673958d213c
2019-10-09 16:19:44 -07:00
jun.wang
5341e17199 Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime
Add the initialization of the incrementalResultsPeriodicity and
maxSearchTime in the networkScan request.
The incrementalResultsPeriodicity and maxSearchTime are not
initialized in the networkScan request. So the default value is 0.
But the incrementalResultsPeriodicity and maxSearchTime
are required not to be 0 in subsequent tests.

CL ported from pag/1433565

Bug:140451434
Test: make vts && vts-tradefed run commandAndExit vts -m \
      VtsHalRadioV1_2Target -t RadioHidlTest_v1_2#startNetworkScan
Change-Id: I1b4e512a37d3d85ebc905a64987a40af801bce53
(cherry picked from commit f7894eb4d8c395add7c70a20520336057ae2656f)
2019-10-09 15:41:59 -07:00
David Gross
b14faf16d3 Replace sync_enums_to_hal.py with generate_api.{py,sh} and regenerate */types.hal
am: 8c0a48bceb

Change-Id: Ifcdb58dbf2c71d2bd178f221770f2bf5e12a1164
2019-10-09 12:08:36 -07:00
Michael Butler
485abc99bc Increase neuralnetworks compatibility to 1.3
Bug: 139120468
Test: mma
Change-Id: Ic41febe005dfefe834587ec67fdda52e112c37cb
Merged-In: Ic41febe005dfefe834587ec67fdda52e112c37cb
(cherry picked from commit 7259f3ab24)
2019-10-09 14:18:49 +01:00
Lev Proleev
543606fb92 Modify NNAPI VTS tests to run on version 1.3
Bug: 139120468
Test: VtsHalNeuralnetworksV1_3TargetTest
Change-Id: Id9e4d99852da8a3d5167ab7464c0e71885250501
Merged-In: Id9e4d99852da8a3d5167ab7464c0e71885250501
(cherry picked from commit b49dadfb64)
2019-10-09 14:18:49 +01:00
Lev Proleev
d0e339e1da Copy VTS tests from v1.2 to v1.3
So that it's easier to see what actually has changed in VTS tests for
version 1.3

Bug: 139120468
Test: m
Change-Id: Ief294d21349ca6531595612a16fa3ae3382f83ac
Merged-In: Ief294d21349ca6531595612a16fa3ae3382f83ac
(cherry picked from commit 3b13b55ac1)
2019-10-09 14:18:49 +01:00
Lev Proleev
bd2b4e78ac Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
Bug: 137828494
Bug: 139120468
Bug: 136735770
Test: mma
Change-Id: I1f615047d1c0c208a90082ffb6ffc43f252f77b4
Merged-In: I1f615047d1c0c208a90082ffb6ffc43f252f77b4
(cherry picked from commit 5a7b67ab8f)
2019-10-09 14:18:49 +01:00
David Gross
8c0a48bceb Replace sync_enums_to_hal.py with generate_api.{py,sh} and regenerate */types.hal
There are certain pieces of NeuralNetworks.h and of our various *.hal
files that ought to be kept in sync -- most notably the operand type
and operation type definitions and descriptions in our
NeuralNetworks.h and types.hal files.  To avoid having to do this
manually, a tool can be employed.

The old solution to this problem is sync_enums_to_hal.py, which parses
the existing NeuralNetworks.h and types.hal files, and then rewrites
the types.hal files: It identifies the operand type and operation type
portions of the files, and in the types.hal files replaces them with
transformed versions of the portions from NeuralNetworks.h.  This
approach is brittle -- it is very sensitive to the structure of the
files, as was recognized when this tool was created.  Changes to those
files since the script was last updated essentially broke the script,
as noted in http://b/140132458.

The new solution employs a new tool generate_api.py to combine a
single "specification file" with one "template file" per API file
(NeuralNetworks.h or types.hal) to produce that API file.  The script
generate_api.sh invokes generate_api.py once per API file, passing
appropriate arguments.  See frameworks/ml/nn/tools/api/README.md for
more details.

In the process of combining information from NeuralNetworks.h and
*/types.hal, some formatting, syntactic, and semantic changes have
been made to those files.  For example:
- types.hal files no longer refer to API levels or (similarly)
  to HAL versions other than earlier HAL versions

Bug: 130169064
Bug: 140132458

Test: cd neuralnetworks ; mma

Change-Id: Iceb38effc2c7e6c32344e49225b85256144c0945
Merged-In: Iceb38effc2c7e6c32344e49225b85256144c0945
(cherry picked from commit 2cae5c8b01)
2019-10-09 14:18:06 +01:00
Harpreet "Eli" Sangha
8502c2fd7c vibrator: Support Async Callback APIs
Bug: 136220871
Test: Manually via 'cmd vibrator'
Change-Id: I4201538e4b2e663ac0215c1deb1047658f4d602e
2019-10-09 13:52:54 +09:00
Eric Chung
f6e09b2ff5 Merge "Refine freeBuffer in Mapper 2.0"
am: 9b2431d02a

Change-Id: Ia35e361e2b8343b3ad6205f30b1571547e7bdb3f
2019-10-08 16:26:46 -07:00
Treehugger Robot
9b2431d02a Merge "Refine freeBuffer in Mapper 2.0" 2019-10-08 23:17:06 +00:00