Commit graph

7277 commits

Author SHA1 Message Date
Timur Iskhakov
d5112d3442 Merge "Interface for hidl forward reference test" am: 1b08076ad5 am: 812f779dfe am: 98e9734797
am: 3efd584fe4

Change-Id: If4a39cec2c9f34c0a39eaddb785706d5498760df
2017-09-14 02:24:15 +00:00
Zhuoyao Zhang
62424377c5 Merge "Update build for test hal: libhwbinder" am: 754d21772a am: 597f08a47b am: bf3c5d96c8
am: cf44876032

Change-Id: Ifc11c0bae4a8d8f15427e79c4a50ee3009d5d477
2017-09-14 02:23:30 +00:00
I-Jui (Ray) Sung
7e5fd89e35 Test harness for generated tests am: 2c4e1368e1
am: 7a260bfe8b

Change-Id: I24302c0ea6175f08768e00f6ec97f8217f1d1104
2017-09-14 02:22:51 +00:00
Timur Iskhakov
3efd584fe4 Merge "Interface for hidl forward reference test" am: 1b08076ad5 am: 812f779dfe
am: 98e9734797

Change-Id: I878bf4b47073c3c23acf80a226a51cb8415146bc
2017-09-14 00:08:50 +00:00
Zhuoyao Zhang
cf44876032 Merge "Update build for test hal: libhwbinder" am: 754d21772a am: 597f08a47b
am: bf3c5d96c8

Change-Id: Ie421827cb7dd5d9f3b9e3cc25695b4227fd9e3e8
2017-09-14 00:07:31 +00:00
Timur Iskhakov
98e9734797 Merge "Interface for hidl forward reference test" am: 1b08076ad5
am: 812f779dfe

Change-Id: I80dc5b51213dda1432013ce4c012ffe9e12e1269
2017-09-13 23:04:37 +00:00
Zhuoyao Zhang
bf3c5d96c8 Merge "Update build for test hal: libhwbinder" am: 754d21772a
am: 597f08a47b

Change-Id: I0eddfe7f22364db760e0635221dab6985e9ee351
2017-09-13 23:02:53 +00:00
Timur Iskhakov
812f779dfe Merge "Interface for hidl forward reference test"
am: 1b08076ad5

Change-Id: I28a119c028c89595e63763dabef1eba82f2f9df1
2017-09-13 22:42:28 +00:00
Zhuoyao Zhang
597f08a47b Merge "Update build for test hal: libhwbinder"
am: 754d21772a

Change-Id: Icb1160fbd5798b31816169d908ebe2d35d9b2e28
2017-09-13 22:41:13 +00:00
Michael Butler
92c1776740 Merge "Neuralnetworks HAL cleanup -- hardware/interfaces" into oc-mr1-dev am: 7f750943fe
am: ca49e42532

Change-Id: I71f02064c0812e5a558a43bafdd067e7f6af89ab
2017-09-13 20:12:24 +00:00
Nathan Harold
de210afb90 Merge "Fix docstrings for RIL_CellIdentity" into oc-mr1-dev am: 2de5e5d01a
am: ee35809840

Change-Id: I3abc61991c047f7f9ee8dbeecb8d095b91ff5c53
2017-09-13 20:11:52 +00:00
Michael Butler
b319492619 Merge "Make prepareModel asynchronous." into oc-mr1-dev am: 7621f6f5ed
am: c97678a142

Change-Id: Ia4b42258a93a352e4f4ffd77f8b0f37ba0959b2d
2017-09-13 20:10:23 +00:00
I-Jui (Ray) Sung
7a260bfe8b Test harness for generated tests
am: 2c4e1368e1

Change-Id: I09b70e6439904eb938639f4b2116d7ce707b1293
2017-09-13 20:07:51 +00:00
Treehugger Robot
1b08076ad5 Merge "Interface for hidl forward reference test" 2017-09-13 19:59:05 +00:00
Michael Butler
ca49e42532 Merge "Neuralnetworks HAL cleanup -- hardware/interfaces" into oc-mr1-dev
am: 7f750943fe

Change-Id: I82984896ef174949de6a60f887e9c8a614b06463
2017-09-13 19:44:01 +00:00
Nathan Harold
ee35809840 Merge "Fix docstrings for RIL_CellIdentity" into oc-mr1-dev
am: 2de5e5d01a

Change-Id: I78509bf9573f0d898cf0b3658ceec960e96ed466
2017-09-13 19:43:14 +00:00
Michael Butler
c97678a142 Merge "Make prepareModel asynchronous." into oc-mr1-dev
am: 7621f6f5ed

Change-Id: I60f0d1582ee54ae41d8ddcbf89d5a44a2a410eda
2017-09-13 19:42:20 +00:00
Zhuoyao Zhang
754d21772a Merge "Update build for test hal: libhwbinder" 2017-09-13 16:58:17 +00:00
Peng Xu
a7aea2d0f9 Merge "Sensor direct report test - gralloc support" am: b7841f02e2 am: 4ff424ce6c am: 4fb2a83d2c
am: 26db75df1b  -s ours

Change-Id: I2c3ef7b3049da504c5ccac215f0331f8a898f0a8
2017-09-13 09:43:44 +00:00
I-Jui (Ray) Sung
2c4e1368e1 Test harness for generated tests
Created initial test harness for test models and examples from
NNAPI test generator in VtsHalNeuralnetworksV1_0TargetTest. As
an example, also added a test generated from test spec at
frameworks/ml/nn/tools/test_generator/tests/P_vts_full/.

Generated model setup code and examples are from:
frameworks/ml/nn/runtime/test/generated/examples and
frameworks/ml/nn/runtime/test/generated/vts_models respectively.

Bug: 63905942
Bug: 63525563
Test: VtsHalNeuralnetworksV1_0TargetTest with sample driver enabled
      by cherry-pick

Change-Id: Ief029eed9718c8724ef0b64fc6a7f6b9a7bc7b7b
2017-09-13 08:02:05 +00:00
Michael Butler
7f750943fe Merge "Neuralnetworks HAL cleanup -- hardware/interfaces" into oc-mr1-dev 2017-09-13 07:29:43 +00:00
Michael Butler
61ae6edbe6 Neuralnetworks HAL cleanup -- hardware/interfaces
Does three primary cleanups:
1) Removes unused OperandTypes, creates OEM types
2) Creates explicit ErrorStatus; functions return status
3) IDevice::initialize renamed to getCapabilities,
   IDevice::getSupportedSubgraph renamed to getSupportedOperations

Additionally fixes the corresponding VTS tests.

Bug: 63905942
Test: mm, vts
Change-Id: Ib4c61b9b13963ac2367f21dc3c20e5946eb955a9
2017-09-12 22:32:25 -07:00
Timur Iskhakov
67753ea3d7 Interface for hidl forward reference test
Test proofs that forward reference can now be used.
Test contains trie implementation and some forward reference examples.

Bug: 31827278

Test: hidl_test

Change-Id: I55cdde500baea3e70ebf4466c681ad652b6ff9fd
2017-09-12 17:41:13 -07:00
Nathan Harold
2de5e5d01a Merge "Fix docstrings for RIL_CellIdentity" into oc-mr1-dev 2017-09-12 22:51:10 +00:00
Peng Xu
26db75df1b Merge "Sensor direct report test - gralloc support" am: b7841f02e2 am: 4ff424ce6c
am: 4fb2a83d2c

Change-Id: I1d00e2b7df13c71dfec62d420b0ceed3195ff774
2017-09-12 22:22:20 +00:00
Zhuoyao Zhang
d2e1850a46 Update build for test hal: libhwbinder
* Use cc_default to extract common build rules.
* Static link android.hardware.tests.libhwbinder@1.0 to the impl lib.

Bug: 65483634
Test: make vts
      vts-tradefed run vts-performance

Change-Id: Ia6fc6593e3f833c1a7de91f817fb684280a8b555
2017-09-12 14:51:52 -07:00
Peng Xu
4fb2a83d2c Merge "Sensor direct report test - gralloc support" am: b7841f02e2
am: 4ff424ce6c

Change-Id: If9a7d6b4f11d0ccefde26246747e40192db908bc
2017-09-12 20:19:50 +00:00
Peng Xu
4ff424ce6c Merge "Sensor direct report test - gralloc support"
am: b7841f02e2

Change-Id: I815c61af5b807fd9a8ebd9d7ccf2842a60f1a1f6
2017-09-12 20:09:59 +00:00
Michael Butler
7621f6f5ed Merge "Make prepareModel asynchronous." into oc-mr1-dev 2017-09-12 18:41:00 +00:00
Peng Xu
b7841f02e2 Merge "Sensor direct report test - gralloc support" 2017-09-12 18:06:24 +00:00
Nathan Harold
8d2d747e9e Fix docstrings for RIL_CellIdentity
Update the documentation to match the current
CTS requirements for Cell Identity reporting
-For LTE, WCDMA, and GSM require that the channel
 number be reported.
-For LTE and WCDMA, require that the correct
 physical channel identifier be reported. Note that
 due to b/32774471 we still cannot require BSIC
 to be reported.

Bug: 65174915
Test: none, comment-only change
Change-Id: I93fcce3b39401e8965f724722361c2cadc4a88cc
2017-09-12 10:17:53 -07:00
Ahmed ElArabawy
ed8227c738 Merge "Remove default implementation for PowerHal 1.1" into oc-mr1-dev am: 3822ffb138
am: 7bbd5e606f  -s ours

Change-Id: I6143852ccde302bb1ce651f8b5e8415a043d7d6f
2017-09-12 17:00:34 +00:00
Ahmed ElArabawy
7bbd5e606f Merge "Remove default implementation for PowerHal 1.1" into oc-mr1-dev
am: 3822ffb138

Change-Id: Ia168f1165f27dad0221abbcb83ed4e7b1079d471
2017-09-12 16:57:07 +00:00
TreeHugger Robot
3822ffb138 Merge "Remove default implementation for PowerHal 1.1" into oc-mr1-dev 2017-09-12 16:51:33 +00:00
Shawn Willden
f4957cce5b Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079 am: 35e1be70b4 am: cb6c717104
am: 33f4df697c

Change-Id: I8a50f27cf67412e54880f6fb5eac10356138cb6f
2017-09-12 16:42:12 +00:00
Shawn Willden
698946eb34 Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079 am: 35e1be70b4 am: 64978d763d
am: b4766e598b

Change-Id: I58f72f73fbca2274a2d8f726bf5ed50438c992f8
2017-09-12 16:41:53 +00:00
Shawn Willden
33f4df697c Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079 am: 35e1be70b4
am: cb6c717104

Change-Id: I560fa783255e83454fb0e32861ca26f7f79b8a3d
2017-09-12 16:39:02 +00:00
Shawn Willden
b4766e598b Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079 am: 35e1be70b4
am: 64978d763d

Change-Id: I9e3f621fb66a357d7f81975bd7fe14ab79e07013
2017-09-12 16:37:22 +00:00
Shawn Willden
64978d763d Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079
am: 35e1be70b4

Change-Id: Ic1b7023117d6531da2f535a6b6cb145a228259bf
2017-09-12 16:34:52 +00:00
Shawn Willden
cb6c717104 Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079
am: 35e1be70b4

Change-Id: I626faecd254e3e543308143cfe69d1393e1f9267
2017-09-12 16:34:52 +00:00
Shawn Willden
35e1be70b4 Merge "Don't send more than 2K to addRngEntropy" into oc-dev
am: 7eeb6b5079

Change-Id: Id0ee0e3f22ee4f2d2b730054043d28c01ac19c6f
2017-09-12 16:31:32 +00:00
TreeHugger Robot
7eeb6b5079 Merge "Don't send more than 2K to addRngEntropy" into oc-dev 2017-09-12 16:28:44 +00:00
Ahmed ElArabawy
4497a5fe33 Remove default implementation for PowerHal 1.1
Default implementation in powerHAL 1.1 is not used by any device
Devices using powerHal 1.1 have their own implementation in their
device/<vendor>/<devicename> while older devices don't use 1.1 at all.
This CL removes the default implementation for the PowerHAL 1.1

Bug: 65453628
Test: Build successfully (code not used anyway)
Merged-In: I695348683c6e2e504a523897082543274dc239aa

Change-Id: I695348683c6e2e504a523897082543274dc239aa
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
2017-09-12 16:05:50 +00:00
Shawn Willden
b5048b4d0b Merge "Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a am: ac06f7576e am: e5266362e9" into oc-mr1-dev-plus-aosp
am: d6cb9a969b

Change-Id: If557073a55d5464ec8347471fdd108264a3df983
2017-09-12 07:00:08 +00:00
Shawn Willden
151a6b5179 Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a am: ac06f7576e am: 859db2ba9e
am: cbbb5b2e9d

Change-Id: I999f6841d8e88980d622a0c5726fda7e98fc357c
2017-09-12 06:59:47 +00:00
Android Build Merger (Role)
d6cb9a969b Merge "Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a am: ac06f7576e am: e5266362e9" into oc-mr1-dev-plus-aosp 2017-09-12 06:56:36 +00:00
Shawn Willden
5f3f34910c Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a am: ac06f7576e
am: e5266362e9

Change-Id: I8d6b8a288a4fb906adad78c056e4a3b066110da6
2017-09-12 06:56:24 +00:00
Shawn Willden
cbbb5b2e9d Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a am: ac06f7576e
am: 859db2ba9e

Change-Id: I5fac1f89c6eed68e803a7887a51efd027f342cef
2017-09-12 06:56:17 +00:00
Shawn Willden
e5266362e9 Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a
am: ac06f7576e

Change-Id: Ib6e0f30a2ca4d6b075bdc4c232cbf47c6febc82e
2017-09-12 06:53:16 +00:00
Shawn Willden
859db2ba9e Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a
am: ac06f7576e

Change-Id: I219c56653ec9051d35a4c7c8f012c9c06e555881
2017-09-12 06:53:16 +00:00