Commit graph

6247 commits

Author SHA1 Message Date
Ruchi Kandoi
eeef526407 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: 029633dcd0 am: 781ce91bcd
am: 9138b4cec5

Change-Id: Ide321120025115bdc8d89afd07fec3d080df6ac8
2017-08-03 19:21:10 +00:00
Ruchi Kandoi
9138b4cec5 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: 029633dcd0
am: 781ce91bcd

Change-Id: I01ff9b7452ce6a2b5b77cb4cd5a67074c7e372b0
2017-08-03 19:10:09 +00:00
Ruchi Kandoi
781ce91bcd nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0
am: 029633dcd0

Change-Id: I7377ba90f9fe42f3d2880c5c9e6f494203050213
2017-08-03 19:04:38 +00:00
Android Build Merger (Role)
60082f2f51 Merge "Merge "graphics: ignore/reduce spurious vsync in VTS" into oc-dr1-dev am: d1231716d3 am: 58fbba63b7" into oc-mr1-dev-plus-aosp 2017-08-03 17:52:55 +00:00
Chia-I Wu
38a1e714be Merge "graphics: ignore/reduce spurious vsync in VTS" into oc-dr1-dev am: d1231716d3
am: 7649049b1e

Change-Id: I5338b531434e7346c232d7514fa4ba03f393d4d1
2017-08-03 17:52:34 +00:00
Chia-I Wu
5e4aa150a6 Merge "graphics: ignore/reduce spurious vsync in VTS" into oc-dr1-dev am: d1231716d3
am: 58fbba63b7

Change-Id: I1c60e660c86cb672f0489d3b11daf3bdaa5ba733
2017-08-03 17:52:34 +00:00
Chia-I Wu
58fbba63b7 Merge "graphics: ignore/reduce spurious vsync in VTS" into oc-dr1-dev
am: d1231716d3

Change-Id: I6dae4a4f7e287abd7438ece780cefca2bf19ac39
2017-08-03 17:46:34 +00:00
Chia-I Wu
7649049b1e Merge "graphics: ignore/reduce spurious vsync in VTS" into oc-dr1-dev
am: d1231716d3

Change-Id: I1be50d115f48d4efd6148c83a59a8c4e4e7f2096
2017-08-03 17:46:34 +00:00
TreeHugger Robot
d1231716d3 Merge "graphics: ignore/reduce spurious vsync in VTS" into oc-dr1-dev 2017-08-03 17:35:26 +00:00
Tomasz Wasilczyk
cf0305b5bf Merge "Linguistic fixes for broadcastradio 1.1 HAL." into oc-mr1-dev
am: e16fb74b05

Change-Id: I27c62f2822c3f3087556f612c1661178aecf2e71
2017-08-03 17:08:39 +00:00
Tomasz Wasilczyk
918322fc32 Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
am: b75bb41575

Change-Id: I2b97cef2feba9675fd5123fd56b99955c42ba1fa
2017-08-03 17:02:58 +00:00
Tomasz Wasilczyk
e16fb74b05 Merge "Linguistic fixes for broadcastradio 1.1 HAL." into oc-mr1-dev 2017-08-03 16:54:54 +00:00
Tomasz Wasilczyk
b75bb41575 Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev 2017-08-03 16:52:31 +00:00
Ruchi Kandoi
157951e2e5 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: c901276e60 am: 90c456f82e am: fcb195c0a4
am: 25e1ed4d8d

Change-Id: I6136a824117ec921e755e77c89eeb4664ab27007
2017-08-03 16:45:31 +00:00
Ruchi Kandoi
25e1ed4d8d nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: c901276e60 am: 90c456f82e
am: fcb195c0a4

Change-Id: I3d9b52e8835ca0feecb4553e6559fd2fae425e6a
2017-08-03 16:39:34 +00:00
Ruchi Kandoi
fcb195c0a4 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: c901276e60
am: 90c456f82e

Change-Id: I11011bd1b09fa26211c3d333c621fc2e16c6b57d
2017-08-03 16:34:00 +00:00
Ruchi Kandoi
90c456f82e nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0
am: c901276e60

Change-Id: Ia846b4a158889cd236e5e8b1b6e128b71266abf3
2017-08-03 16:28:31 +00:00
Ruchi Kandoi
029633dcd0 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0
Bug: 64245250
Test: run vts test
Change-Id: I4ca434fb1fb44a6278942f020ddd02b162d7f605
(cherry picked from commit c901276e60)
2017-08-03 09:26:02 -07:00
Tri Vo
7694738e26 Update Android.bp HIDL makefiles
am: f5d136c231

Change-Id: Iaabf86403c85f7cbf57d78de5abbfaff0c53fec5
2017-08-03 15:20:54 +00:00
Tri Vo
f5d136c231 Update Android.bp HIDL makefiles
Allow HAL definition libs to be static.

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2017-08-03 00:30:01 +00:00
Ruchi Kandoi
c901276e60 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0
Bug: 64245250
Test: run vts test
Change-Id: I4ca434fb1fb44a6278942f020ddd02b162d7f605
2017-08-03 00:23:29 +00:00
Steven Moreland
32cf03c18a Merge "Update HIDL makefiles." into oc-mr1-dev
am: 7dcc345b64  -s ours

Change-Id: I955d0c273d38a705b72ad987c4cf5fc49779e571
2017-08-02 22:41:57 +00:00
TreeHugger Robot
7dcc345b64 Merge "Update HIDL makefiles." into oc-mr1-dev 2017-08-02 22:31:27 +00:00
Michael Butler
fb5a6f8dbf Add OWNERS file to Neuralnetworks VTS test directory
am: dfc529dfef

Change-Id: Id3448c5d293511386e267c2f336380a0abc55b72
2017-08-02 21:33:06 +00:00
Tomasz Wasilczyk
9214894ebc Linguistic fixes for broadcastradio 1.1 HAL.
Bug: b/64113304
Test: it builds
Change-Id: I5d5d090a44146e327d7b0f69cc2ba97060f3b515
2017-08-02 13:35:09 -07:00
Steven Moreland
208a586cf8 Update HIDL makefiles.
Allow them to be static.

This is required for a couple of reasons:
- enabling HIDL passthrough in recovery
- enabling VTS tests to be static blobs

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Merged-In: I1b2401fb273ab80819e3870aa71fe742269674ba
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
(cherry picked from commit 7206708528)
2017-08-02 12:52:41 -07:00
Sundong Ahn
3bee656e84 Change dependency library am: 94293086f8 am: 79e801cb18 am: aad41e85d4
am: 8ca20771e7

Change-Id: I1b2b68a760751ec6dcb05db1ee6fdead0f00db33
2017-08-02 17:23:11 +00:00
Sundong Ahn
8ca20771e7 Change dependency library am: 94293086f8 am: 79e801cb18
am: aad41e85d4

Change-Id: I079faa1a1438b0d2b0d8e5ed7929c77e73519ca1
2017-08-02 17:14:59 +00:00
Sundong Ahn
aad41e85d4 Change dependency library am: 94293086f8
am: 79e801cb18

Change-Id: I2a26619067a97e1294b6794fe8113b92b69a7abe
2017-08-02 17:06:07 +00:00
Sundong Ahn
79e801cb18 Change dependency library
am: 94293086f8

Change-Id: I3b024890195dad8fa3435a4ff493adbddb63ef20
2017-08-02 16:56:46 +00:00
Michael Butler
dfc529dfef Add OWNERS file to Neuralnetworks VTS test directory
Added all six Neuralnetworks team members and two VTS team members

Bug: 63905942
Bug: 63525563
Test: Not needed
Change-Id: I87a2968af5ceec656e8f392cc0291689e66fef5d
2017-08-02 00:21:06 -07:00
Yin-Chia Yeh
884a3017d3 Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38 -s ours am: e2f3270db5 -s ours
am: 02a41621ff  -s ours

Change-Id: Idaf54e0b5a6ffc245ff140d650ad785e8adfd6e7
2017-08-02 02:15:42 +00:00
sqian
e43ae37d80 resolve merge conflicts of 345a396c to oc-dr1-dev am: a6e57a9647 -s ours
am: 9f103257c4  -s ours

Change-Id: I543ddfcaab24e3e3d15169647052fd910fabf14c
2017-08-02 02:15:23 +00:00
Yin-Chia Yeh
02a41621ff Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38 -s ours
am: e2f3270db5  -s ours

Change-Id: I892b86fc36cf4e60dbfa7b00b383cb93c5a85d13
2017-08-02 01:58:38 +00:00
sqian
9f103257c4 resolve merge conflicts of 345a396c to oc-dr1-dev
am: a6e57a9647  -s ours

Change-Id: Idc6b4412e4f2548d1635136a52f93ff1bdbea4a9
2017-08-02 01:58:04 +00:00
Yin-Chia Yeh
6de347e477 Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38 am: e31ea3ab65 -s ours
am: 04eab47d94  -s ours

Change-Id: I85cf0b94ddc58f0c7c015741cc06886977ac3f2c
2017-08-02 01:46:33 +00:00
sqian
0014284e43 resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp
am: 9a73da9161  -s ours

Change-Id: I8583b1e0bf0d01d3eedc3526b5b2870a40f16523
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  -s ours

Change-Id: I0860c4dfaf348c4e44696e7ff3b0717c9f99797b
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  -s ours

Change-Id: I8c4714b9944249651a67fc5ba9b65108be144887
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

Change-Id: I08f0bea6077b0015330bcd03e9ae44cf448a6c22
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  -s ours

Change-Id: I1007702b75ad0e0065ee14691a2984afe688fbd5
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  -s ours

Change-Id: I2a852800a6c31e87d002db710dc10faab7f65d0d
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  -s ours

Change-Id: I4cf59eaf2e9583af574d50f9ddb830eb34e3356d
2017-08-02 01:19:33 +00:00
sqian
d70c51cdae resolve merge conflicts of 345a396c to oc-dr1-dev
am: a6e57a9647  -s ours

Change-Id: I20dc609d760162f16780115f3af2c8635662f1b5
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

Change-Id: I789b1f2d74b79b8479bc6b389b2dab2ca5104c74
2017-08-01 23:37:59 +00:00
Michael Butler
ebd5565909 Move neuralnetworks HAL to hardware/interfaces
am: 376ec0c0fd

Change-Id: I889e983dcfc7a129dc985887dd407ff378804ddb
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

Change-Id: I194688afcf1143f7ac40416150986cd8e4ad02aa
2017-08-01 22:05:24 +00:00