Commit graph

5759 commits

Author SHA1 Message Date
Tri Vo
84d1627979 Merge changes from topic 'vts_deps' am: 7d149a564f am: 7f8774ef80
am: 3b84dc5c78

Change-Id: I00c00e9e48d0275a78fb8914fdbc85de10b0d060
2017-08-03 20:27:47 +00:00
Tri Vo
3b84dc5c78 Merge changes from topic 'vts_deps' am: 7d149a564f
am: 7f8774ef80

Change-Id: Ieb521a2e25f9483d68d33a8c9d4b2d957da978c7
2017-08-03 20:21:47 +00:00
Tri Vo
7f8774ef80 Merge changes from topic 'vts_deps'
am: 7d149a564f

Change-Id: Idf236b741d7ff2cc529002218c34a3b4f0cf625c
2017-08-03 20:15:19 +00:00
Treehugger Robot
7d149a564f Merge changes from topic 'vts_deps'
* changes:
  VTS tests now static link to HAL def libs.
  Add cc_defaults VtsHalTargetTestDefaults
2017-08-03 20:06:15 +00:00
Android Build Merger (Role)
711f0ffcbf Merge "nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: 029633dcd0 am: 781ce91bcd" into oc-dr1-dev-plus-aosp 2017-08-03 19:10:25 +00:00
Ruchi Kandoi
3e8c96066e nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: 029633dcd0
am: 39d195e495

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

Change-Id: I98ad7cf374d388d5a7243f8907da3c0adbecf8c0
2017-08-03 19:10:09 +00:00
Ruchi Kandoi
39d195e495 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0
am: 029633dcd0

Change-Id: I110e0592eb54e00ca0ae864f995adb3d8f16f626
2017-08-03 19:04:38 +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
Tri Vo
6c2bd86f70 VTS tests now static link to HAL def libs.
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: compiles
Change-Id: I3cfb1a64f6abcf3145337a736800b72d92a0b152
2017-08-03 18:04:00 +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
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
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
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
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
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
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
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
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
TreeHugger Robot
72ff9a1e38 Merge "Camera: reset callback after test done" into oc-dev 2017-08-01 21:40:35 +00:00
Tri Vo
0b19836cea Add cc_defaults VtsHalTargetTestDefaults
Makes it easier to control how vts tests link to system libs.
Also, removes a lot of redundant lines in test make rules.

Bug: 64040096
Test: compiles
Change-Id: I10796e3fa8f61a307dbb7edace537a96ec83bea7
2017-08-01 14:29:43 -07: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
Shuo Qian
140b84b377 Merge "Add EMPTY_RECORD for getDeviceIdentity" into oc-dev
am: 345a396c18

Change-Id: I1188659709dfa1bf475375a4fbbcb6258d5d991c
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
Sundong Ahn
94293086f8 Change dependency library
hwbinder.jar will be used instead of framework.jar on build-time, but
on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework.

Bug: 35771640
Test: no test.
Change-Id: I04cab676c91d2ea423f5e2c1b2b9efa15e522f37
2017-08-01 11:24:01 +09: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
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
7097592d46 Merge "Add corresponding error code to fix vts test" into oc-dev am: 417af3a797
am: 2ad5aecc2e  -s ours

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

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

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

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

Change-Id: I47d667239c7a699d3b77a42ebbf08c5cd12f90ac
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
Android Build Merger (Role)
b89ca18b38 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 2017-08-01 00:09:02 +00:00
Kevin Rocard
352070c11e Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf
am: e93e38a91d

Change-Id: Ibf5b6c05c340d7ae423ab0149067b4db58ff6c97
2017-08-01 00:08:46 +00:00
Kevin Rocard
f4410ca6c0 Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf
am: 3f60c009dc

Change-Id: Ibf84197428ce6fd98224135107ddefa58786b8ad
2017-08-01 00:08:46 +00:00
Kevin Rocard
3f60c009dc Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev
am: 90e68d31cf

Change-Id: Iadee05e91ad122c99b3d33b92c47b6fbcc27f2af
2017-08-01 00:05:16 +00:00
Kevin Rocard
e93e38a91d Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev
am: 90e68d31cf

Change-Id: I0aa31b2996c8aae97d0b7ba16d9943f47d70a1fe
2017-08-01 00:05:16 +00:00
TreeHugger Robot
90e68d31cf Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev 2017-07-31 23:56:02 +00:00
sqian
293bbfdc3e Add corresponding error code to fix vts test
Test: run vts
Bug: 63152815
Bug: 62989786
Bug: 64041522
Change-Id: Ifbd17f85b39221de31ec7884b30dc176e1cbd3ab
Merged-In: Ifbd17f85b39221de31ec7884b30dc176e1cbd3ab
2017-07-31 15:00:44 -07:00
Sohani Rao
c17e286b9f Merge "Wifi Offload HAL: Improve VTS tests for scanConfig" into oc-dr1-dev
am: cf43256fa9

Change-Id: I6dc1e8402c30a15f53273d059231b33d958eee4e
2017-07-31 19:59:29 +00:00
TreeHugger Robot
cf43256fa9 Merge "Wifi Offload HAL: Improve VTS tests for scanConfig" into oc-dr1-dev 2017-07-31 19:52:44 +00:00