Yin-Chia Yeh
6de347e477
Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38 am: e31ea3ab65 -s ours
...
am: 04eab47d94
2017-08-02 01:46:33 +00:00
sqian
0014284e43
resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp
...
am: 9a73da9161
2017-08-02 01:43:03 +00:00
Yin-Chia Yeh
04eab47d94
Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38
...
am: e31ea3ab65
2017-08-02 01:43:02 +00:00
Yin-Chia Yeh
183d5af38d
Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38 -s ours am: e2f3270db5 -s ours
...
am: b026c45b29
2017-08-02 01:27:48 +00:00
Ram Mohan M
b9ddad3e8a
Merge "bug fix: handle OMX_EventBufferFlag events" into oc-mr1-dev
...
am: 35adbc2a4d
2017-08-02 01:27:33 +00:00
Yin-Chia Yeh
b026c45b29
Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38 -s ours
...
am: e2f3270db5
2017-08-02 01:23:38 +00:00
sqian
68619c9b53
resolve merge conflicts of 345a396c to oc-dr1-dev am: a6e57a9647 -s ours
...
am: d70c51cdae
2017-08-02 01:23:36 +00:00
TreeHugger Robot
35adbc2a4d
Merge "bug fix: handle OMX_EventBufferFlag events" into oc-mr1-dev
2017-08-02 01:22:25 +00:00
Yin-Chia Yeh
e2f3270db5
Merge "Camera: reset callback after test done" into oc-dev
...
am: 72ff9a1e38
2017-08-02 01:19:33 +00:00
sqian
d70c51cdae
resolve merge conflicts of 345a396c to oc-dr1-dev
...
am: a6e57a9647
2017-08-02 01:19:32 +00:00
sqian
9a73da9161
resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia06246656aa4ef9db0b68942402ea0264fb92b17
Merged-In: I9200fb932032e6e23a5f4401fa5698140a278d07
2017-08-02 01:11:38 +00:00
Michael Butler
aa956d8f19
Merge changes from topic 'nnapi_hal_move' into oc-mr1-dev
...
am: 9154eae534
2017-08-01 23:37:59 +00:00
Michael Butler
ebd5565909
Move neuralnetworks HAL to hardware/interfaces
...
am: 376ec0c0fd
2017-08-01 23:37:56 +00:00
Michael Butler
9154eae534
Merge changes from topic 'nnapi_hal_move' into oc-mr1-dev
...
* changes:
Initial VTS tests for Neural Networks HAL.
Move neuralnetworks HAL to hardware/interfaces
2017-08-01 23:28:18 +00:00
Yin-Chia Yeh
e31ea3ab65
Merge "Camera: reset callback after test done" into oc-dev
...
am: 72ff9a1e38
2017-08-01 22:05:24 +00:00
Sanket Padawe
6287226509
Update VTS tests so that more tests pass for O.
...
am: d7f198c9ab
2017-08-01 22:05:20 +00:00
TreeHugger Robot
72ff9a1e38
Merge "Camera: reset callback after test done" into oc-dev
2017-08-01 21:40:35 +00:00
sqian
a6e57a9647
resolve merge conflicts of 345a396c to oc-dr1-dev
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
Merged-In: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
2017-08-01 12:25:53 -07:00
Sanket Padawe
d7f198c9ab
Update VTS tests so that more tests pass for O.
...
Cherry picked from ag/2562201
Bug: b/62926561
Test: vts tests
Change-Id: Ic927f9efd437c6411fb14feac8c681334e4b5e60
Merged-in: Ic927f9efd437c6411fb14feac8c681334e4b5e60
2017-08-01 11:57:32 -07:00
Sanket Padawe
8efce0cb96
Merge "Add owners for radio vts." into oc-mr1-dev
...
am: 5b41d1181a
2017-08-01 18:10:29 +00:00
TreeHugger Robot
5b41d1181a
Merge "Add owners for radio vts." into oc-mr1-dev
2017-08-01 18:05:37 +00:00
Shuo Qian
140b84b377
Merge "Add EMPTY_RECORD for getDeviceIdentity" into oc-dev
...
am: 345a396c18
2017-08-01 18:00:48 +00:00
Shuo Qian
345a396c18
Merge "Add EMPTY_RECORD for getDeviceIdentity" into oc-dev
2017-08-01 17:55:32 +00:00
Shuo Qian
7e94262e02
Merge "Add EMPTY_RECORD for getDeviceIdentity" into oc-mr1-dev
...
am: 5d622ba374
2017-08-01 17:08:20 +00:00
Shuo Qian
5d622ba374
Merge "Add EMPTY_RECORD for getDeviceIdentity" into oc-mr1-dev
2017-08-01 17:00:06 +00:00
Enrico Granata
603e7f0867
Merge "Improvements to the documentation for the OBD2 properties" into oc-mr1-dev
...
am: c2fa0484ed
2017-08-01 01:00:05 +00:00
sqian
67901bf2ce
Add EMPTY_RECORD for getDeviceIdentity
...
Remove same unit test case with arguments "","0" for:
- sendEnvelope
- sendTerminalResponseToSim
- sendEnvelopeWithStatus
Test: verified by vendor, treehuger
Bug: 62926561
Change-Id: I5f535bdfc5821275a7ea2571d411374e0d7a8822
Merged-In: I5f535bdfc5821275a7ea2571d411374e0d7a8822
2017-07-31 17:56:36 -07:00
sqian
7a47d2d0be
Add EMPTY_RECORD for getDeviceIdentity
...
Remove same unit test case with arguments "","0" for:
- sendEnvelope
- sendTerminalResponseToSim
- sendEnvelopeWithStatus
Test: verified by vendor, treehuger
Bug: 62926561
Change-Id: I5f535bdfc5821275a7ea2571d411374e0d7a8822
Merged-In: I5f535bdfc5821275a7ea2571d411374e0d7a8822
2017-07-31 17:55:49 -07:00
Michael Butler
bb4ff6557f
Initial VTS tests for Neural Networks HAL.
...
This CL has the basic framework for the NNAPI VTS tests with one
positive function test for each HAL function. This CL is being uploaded
now because the NN API HAL files are being moved to hardware/interfaces.
Bug: 63905942
Bug: 63525563
Test: mm -j40
Test: vts-tradefed runs and passes
Change-Id: I8f3d606ec50a6a6d110c89132e6fb89f53f3bf48
2017-07-31 17:49:28 -07:00
TreeHugger Robot
c2fa0484ed
Merge "Improvements to the documentation for the OBD2 properties" into oc-mr1-dev
2017-08-01 00:40:56 +00:00
Android Build Merger (Role)
6dd10a4b1d
Merge "Merge "Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797 am: 2ad5aecc2e -s ours" into oc-dr1-dev-plus-aosp am: ba1ac6f722 -s ours" into oc-mr1-dev-plus-aosp
2017-08-01 00:31:33 +00:00
Shuo Qian
823c026a85
Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797 -s ours am: ec37054b9e -s ours
...
am: 1ab1eabf7c
2017-08-01 00:31:21 +00:00
Shuo Qian
47a419aefd
Merge "Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797 am: 2ad5aecc2e -s ours" into oc-dr1-dev-plus-aosp
...
am: ba1ac6f722
2017-08-01 00:31:21 +00:00
Shuo Qian
07d07936c7
Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797 -s ours am: ec37054b9e -s ours
...
am: ce28abe7ed
2017-08-01 00:28:20 +00:00
Android Build Merger (Role)
7def80effd
Merge "Merge "Add corresponding error code to fix vts test" into oc-dr1-dev am: a20caf7720 -s ours am: 76caf3d874 -s ours" into oc-mr1-dev-plus-aosp
2017-08-01 00:28:07 +00:00
Android Build Merger (Role)
ba1ac6f722
Merge "Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797 am: 2ad5aecc2e -s ours" into oc-dr1-dev-plus-aosp
2017-08-01 00:28:06 +00:00
Shuo Qian
1ab1eabf7c
Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797 -s ours
...
am: ec37054b9e
2017-08-01 00:27:53 +00:00
Shuo Qian
8591d751b1
Merge "Add corresponding error code to fix vts test" into oc-dr1-dev am: a20caf7720 -s ours
...
am: 76caf3d874
2017-08-01 00:27:53 +00:00
Shuo Qian
7097592d46
Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797
...
am: 2ad5aecc2e
2017-08-01 00:27:53 +00:00
Shuo Qian
ce28abe7ed
Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797 -s ours
...
am: ec37054b9e
2017-08-01 00:27:52 +00:00
Shuo Qian
7fe8923358
Merge "Add corresponding error code to fix vts test" into oc-dr1-dev am: a20caf7720 -s ours
...
am: 1e6c18c334
2017-08-01 00:27:52 +00:00
Shuo Qian
2ad5aecc2e
Merge "Add corresponding error code to fix vts test" into oc-dev
...
am: 417af3a797
2017-08-01 00:25:23 +00:00
Shuo Qian
ec37054b9e
Merge "Add corresponding error code to fix vts test" into oc-dev
...
am: 417af3a797
2017-08-01 00:25:20 +00:00
Shuo Qian
76caf3d874
Merge "Add corresponding error code to fix vts test" into oc-dr1-dev
...
am: a20caf7720
2017-08-01 00:25:20 +00:00
Shuo Qian
1e6c18c334
Merge "Add corresponding error code to fix vts test" into oc-dr1-dev
...
am: a20caf7720
2017-08-01 00:25:20 +00:00
Shuo Qian
417af3a797
Merge "Add corresponding error code to fix vts test" into oc-dev
2017-08-01 00:19:48 +00:00
Shuo Qian
a20caf7720
Merge "Add corresponding error code to fix vts test" into oc-dr1-dev
2017-08-01 00:19:33 +00:00
Kevin Rocard
fe7e8b7b41
Merge "Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf am: 3f60c009dc" into oc-dr1-dev-plus-aosp
...
am: b89ca18b38
2017-08-01 00:18:32 +00:00
Kevin Rocard
f5f6e43f56
Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf am: e93e38a91d
...
am: 352070c11e
2017-08-01 00:18:17 +00:00
Kevin Rocard
784559b837
Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf am: e93e38a91d
...
am: f088e57008
2017-08-01 00:17:06 +00:00
