Commit Graph

6281 Commits

Author SHA1 Message Date
Steven Moreland
a7a300a13b Merge "Update makefiles for vndk enabled." into oc-mr1-dev
am: d9b12c13e5

Change-Id: Id70e58e6b4d20dada4aab107b2aa98c58cf167ca
2017-08-04 01:04:40 +00:00
TreeHugger Robot
d9b12c13e5 Merge "Update makefiles for vndk enabled." into oc-mr1-dev 2017-08-04 00:52:06 +00:00
Tomasz Wasilczyk
d79175855d Merge "Implement missing broadcastradio 1.1 VTS tests." into oc-mr1-dev
am: 9da1f3be59

Change-Id: I8f17dd871aea62eab2f7fa498cc1eea7e0d56d6a
2017-08-04 00:19:05 +00:00
Tomasz Wasilczyk
9da1f3be59 Merge "Implement missing broadcastradio 1.1 VTS tests." into oc-mr1-dev 2017-08-04 00:11:02 +00:00
Shuo Qian
3f9edfa9fe Merge "Add vts test for setCarrierInfoForImsiEncryption" am: afcdb1effb am: d4c6c7b703 am: b08d3972fa -s ours
am: 6d188affde  -s ours

Change-Id: I5de574484b633ebbb53011ed38d9c742353ddc40
2017-08-03 23:33:33 +00:00
Shuo Qian
6d188affde Merge "Add vts test for setCarrierInfoForImsiEncryption" am: afcdb1effb am: d4c6c7b703
am: b08d3972fa  -s ours

Change-Id: I768f9aafa5a1a4618bb91fffdcab1f587919372d
2017-08-03 23:28:21 +00:00
Shuo Qian
b08d3972fa Merge "Add vts test for setCarrierInfoForImsiEncryption" am: afcdb1effb
am: d4c6c7b703

Change-Id: I83091fa9a0374478a6a0c69a3787cb061967f257
2017-08-03 23:23:16 +00:00
Shuo Qian
d4c6c7b703 Merge "Add vts test for setCarrierInfoForImsiEncryption"
am: afcdb1effb

Change-Id: I08ab4ff325457ee5242060a5b40e56ce0c227ad4
2017-08-03 23:17:33 +00:00
Shuo Qian
afcdb1effb Merge "Add vts test for setCarrierInfoForImsiEncryption" 2017-08-03 23:08:14 +00:00
Tri Vo
bfc99d6203 Merge "VTS tests now static link to HAL def libs." into oc-mr1-dev
am: f227b7218e  -s ours

Change-Id: I17bd94465b9c5472a7b364fc980d6f3e8240c818
2017-08-03 23:06:32 +00:00
TreeHugger Robot
f227b7218e Merge "VTS tests now static link to HAL def libs." into oc-mr1-dev 2017-08-03 22:57:50 +00:00
Tri Vo
63c2f5c653 Merge "Add cc_defaults VtsHalTargetTestDefaults" into oc-mr1-dev
am: d182bb10e0  -s ours

Change-Id: Ic816a36a9b47683625252d02098b11a86a6fd1ad
2017-08-03 22:38:29 +00:00
TreeHugger Robot
d182bb10e0 Merge "Add cc_defaults VtsHalTargetTestDefaults" into oc-mr1-dev 2017-08-03 22:29:24 +00:00
Enrico Granata
8e5a8d5d0d Merge "Fix a typo in one of the OBD2 ignition monitors" into oc-mr1-dev
am: 72c691df3c

Change-Id: I62b839cd981f8b75a60c8008c1667e10f89446aa
2017-08-03 22:04:54 +00:00
TreeHugger Robot
72c691df3c Merge "Fix a typo in one of the OBD2 ignition monitors" into oc-mr1-dev 2017-08-03 21:58:52 +00:00
Tri Vo
c7d816b680 Merge changes from topic 'vts_deps' am: 7d149a564f am: 7f8774ef80 am: 3b84dc5c78
am: 84d1627979

Change-Id: I809807a17187a401c396cd73721ca9fdccc60f1c
2017-08-03 20:34:21 +00:00
Tri Vo
35c7bd2e2b VTS tests now static link to HAL def libs.
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: compiles
Merged-In: I3cfb1a64f6abcf3145337a736800b72d92a0b152
Change-Id: I3cfb1a64f6abcf3145337a736800b72d92a0b152
(cherry picked from commit 6c2bd86f70)
2017-08-03 13:28:08 -07:00
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
f7c2fbc1a8 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
Merged-In: I10796e3fa8f61a307dbb7edace537a96ec83bea7
Change-Id: I10796e3fa8f61a307dbb7edace537a96ec83bea7
(cherry picked from commit 0b19836cea)
2017-08-03 13:27:33 -07: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
Tomasz Wasilczyk
dd58770c39 Implement missing broadcastradio 1.1 VTS tests.
Bug: b/36864490
Test: VTS
Change-Id: Iff25fdd65624db09e6667d32108e479d5eee6964
2017-08-03 12:59:12 -07:00
Ruchi Kandoi
e53d04b2ec Merge "nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: 029633dcd0 am: 781ce91bcd" into oc-dr1-dev-plus-aosp
am: 711f0ffcbf

Change-Id: I59454a3f14705430c79bb93027839732fd16115a
2017-08-03 19:21:55 +00:00
Ruchi Kandoi
ecbe7e36d2 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: 029633dcd0 am: 39d195e495
am: 3e8c96066e

Change-Id: Iea8b16cfe81e373beb3e9a0b46f057fe4ff24b71
2017-08-03 19:21:40 +00:00
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
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
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
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
sqian
adebf2bdf9 Add vts test for setCarrierInfoForImsiEncryption
Currently there is no implementation for this api by vendor code.
So we should check only for REQUEST_NOT_SUPPPORTED or NONE
as error returned at present.

Test: run vts
Bug: 64073713
Change-Id: I27f544cf6521d2f913f97e1b8f662a05166ddc11
Merged-In: I27f544cf6521d2f913f97e1b8f662a05166ddc11
2017-08-03 11:45:23 -07: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
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