Commit graph

4807 commits

Author SHA1 Message Date
Steven Moreland
4e06dd1aa9 Merge changes from topic 'go-away-static-hidl-java'
am: f4c58cd48c

Change-Id: I3502ad1d51868cd82bbe811bdf2b96ec45ccfbe6
2017-08-04 19:22:05 +00:00
Steven Moreland
f4c58cd48c Merge changes from topic 'go-away-static-hidl-java'
* changes:
  Update makefiles.
  Add an empty 1.1 ISap interface.
  [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
2017-08-04 19:14:48 +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
Steven Moreland
b5da32c177 Update makefiles.
Removes redundant "java-static" target.

Note, targets aren't removed here which have internal
targets that depend on them.

Bug: 36376126
Test: pass
Change-Id: I830f02e5f219d2d58721132c358d2783c3942eac
2017-08-03 15:25:21 -07:00
Amit Mahajan
1e2bd45f3f Add an empty 1.1 ISap interface.
This is needed since manifest doesn't support different versions
for different interfaces in a package. Since there's a 1.1 for
IRadio, there needs to be a 1.1 for ISap as well.

Test: build
Bug: 63598469
Bug: 62371412
Change-Id: I7537b0074f772fab4a26d4ed97d346610784eeac
Merged-In: I9a0bd898e5d236f05d6574b3e3093521d0f57d52
2017-08-03 15:20:29 -07:00
Etan Cohen
e2cc4c4f80 [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
Bug: 62376042
Bug: 36376126
Test: unit tests + integrated (sl4a) tests
Change-Id: I90de33a36bdfdd746710b0c5b0e25458fe3c06c7
Merged-In: I4c0e19a21a268fe7f2d38e82f3743ac5a8e2c6cb
2017-08-03 15:20:24 -07: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
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
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
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
79e801cb18 Change dependency library
am: 94293086f8

Change-Id: I3b024890195dad8fa3435a4ff493adbddb63ef20
2017-08-02 16:56:46 +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
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
Steven Moreland
68a25d22e3 Merge "Update HIDL makefiles."
am: 49dad304a5

Change-Id: I29f1de44312f589ba6e1df9498809cbb31315a2b
2017-07-31 19:33:34 +00:00
Treehugger Robot
49dad304a5 Merge "Update HIDL makefiles." 2017-07-31 19:25:11 +00:00
yinxu
6d9952a70b Fix VTS errors of the network scan API
am: 0e9094142f

Change-Id: Ic3620579f9d428da82f612c71c039336f791ca2d
2017-07-28 22:13:26 +00:00
yinxu
0e9094142f Fix VTS errors of the network scan API
Since the new network scan API is only supported by some devices, we
should add the REQUEST_NOT_SUPPORTED to the possible returned errors.

Cherry-picked cleanly from:
https://googleplex-android-review.git.corp.google.com/#/c/2596051/

Test: Telephony sanity tests, run vts -m VtsHalRadioV1_1Target
Bug: 63914600
Merged-in: I965ee6422aaa5e02bf67466f5288b808183f1738
Change-Id: I965ee6422aaa5e02bf67466f5288b808183f1738
(cherry picked from commit 03c6b592c1)
2017-07-26 11:09:44 -07:00
Steven Moreland
7206708528 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
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
2017-07-26 10:14:57 -07:00
yinxu
a944299fdb Merge " Add VTS code for the network scan API"
am: 6ef70c9040

Change-Id: I53e0827adf81cfde229f2f1d202ba5e589b7b4e3
2017-07-24 23:50:57 +00:00
Treehugger Robot
6ef70c9040 Merge " Add VTS code for the network scan API" 2017-07-24 23:42:11 +00:00
Zhuoyao Zhang
2f7bec8fe4 Move android.hardware.tests.msgq@1.0-impl to system.img
am: ea35563b79

Change-Id: I7adce534ebec348cc0fea8a840cea38e27c73b6c
2017-07-21 20:53:50 +00:00
Zhuoyao Zhang
ea35563b79 Move android.hardware.tests.msgq@1.0-impl to system.img
Bug:63704014
Test: make vts
      vts-tradefed run vts -m VtsFmqUnitTest.

Change-Id: I0deb28ffdbd437cc05d9c1efed63e0ba9dc3a048
2017-07-21 10:53:24 -07:00
yinxu
182d952fb6 Add VTS code for the network scan API
Test: Telephony sanity tests, run vts -m VtsHalRadioV1_1Target
Bug: 63531235

Cherry-picked cleanly from:
https://googleplex-android-review.git.corp.google.com/#/c/2524924/

Merged-in: I25c85b2abb738959d1445e0054049db4bb2f2dfd
Change-Id: I25c85b2abb738959d1445e0054049db4bb2f2dfd
(cherry picked from commit 2495cf5a95)
2017-07-20 16:08:28 -07:00
Stanley Tng
cd762d90e8 Merge "Fixed the HCI ACL Header definitions for PB and BC Flags"
am: adda0e8721

Change-Id: Ie621b523fb21a014dcbc7f5a2295778758333acc
2017-07-20 18:19:35 +00:00
Treehugger Robot
adda0e8721 Merge "Fixed the HCI ACL Header definitions for PB and BC Flags" 2017-07-20 17:50:24 +00:00
Steven Moreland
050dbf98ba Move multithread impl to system.
am: bd10b5aa5a

Change-Id: I6f78d61e3fa13936e57288f34363c8a425ae5cca
2017-07-20 05:21:46 +00:00
Steven Moreland
bd10b5aa5a Move multithread impl to system.
Test: hidl_test passes with linker restrictions in place
Change-Id: Ib860848b1d17073d2b5279d0d390f242864447b4
2017-07-20 03:07:41 +00:00
Stanley Tng
7915b71fb9 Fixed the HCI ACL Header definitions for PB and BC Flags
The byte offsets for Packet Boundary (PB) and Broadcast (BC) flags
in the HCI ACL Header is swapped. This will fixed it so that it matches
the Bluetooth Specifications.

Bug: 63241720
Test: Run manual VTS tests for Bluetooth
Change-Id: Ifc1f4d4f054a1dab13458c563e47bfb884f39d92
2017-07-19 11:03:27 -07:00
sqian
227fe277bf resolve merge conflicts of 6ecc54a7 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.

Change-Id: I369fe9aacf37dcea6225b5e5a658159dfb859ad0
2017-07-18 14:12:10 -07:00
sqian
6ecc54a7ad Fix some VTS for 2017 devices
- sendDeviceState
- setIndicationFilter

Mentioned in b/63148938
- getNeighboringCids

Add Request_not_support for Apis mentioned in Bugs:
 - 62989786
 - 62986286
 - 62987946

Test: run vts
Bug: 63130111
Bug: 63148938
Bug: 62989786
Bug: 62986286
Bug: 62987946
Change-Id: Ib51f67d403bb27f409018a98c07d6aa6aa6d19f8
Merged-In: Ib51f67d403bb27f409018a98c07d6aa6aa6d19f8
2017-07-18 12:06:20 -07:00
Steven Moreland
49abbfdd68 Merge "Move all hidl_test dependencies to the system.img"
am: 46bb27e614

Change-Id: Id46ab1835638aec6c98f0b2775774cb4cc0c34dd
2017-07-18 08:50:32 +00:00
Treehugger Robot
46bb27e614 Merge "Move all hidl_test dependencies to the system.img" 2017-07-18 08:46:33 +00:00
Steven Moreland
2f2aabe212 Move all hidl_test dependencies to the system.img
Test: hidl_test passes
Test: build with BOARD_VNDK_VERSION=current
Bug: 63704014
Change-Id: Ia97be8b4d61236adfd964bf8e4fa632d99010b98
2017-07-17 18:36:02 -07:00
sqian
6e12e894c6 Add RadioIndication for Radio VTS test
am: e635772b01

Change-Id: I535ab37b19272575a8a53364d5332173479d92e0
2017-07-17 20:20:09 +00:00
sqian
e635772b01 Add RadioIndication for Radio VTS test
Fix 1.1 radio folder bug

Bug: 38499208
Test: run vts
Change-Id: I6d39ce258d5318ce06fc7c99dad4caf0a3e35415
Merged-In: I6d39ce258d5318ce06fc7c99dad4caf0a3e35415
2017-07-17 11:10:58 -07:00
Michael Butler
06f79dbd05 Merge "Added protections to RenderScript VTS class teardown."
am: 80002c1ff3

Change-Id: I55d1b0432e87068913a0e40cb72717a3a034b1e7
2017-07-14 22:46:57 +00:00
Treehugger Robot
80002c1ff3 Merge "Added protections to RenderScript VTS class teardown." 2017-07-14 22:38:38 +00:00
Michael Butler
4c65977854 Added protections to RenderScript VTS class teardown.
If RenderScript HIDL server does not exist or cannot be opened,
currently it results in a nullptr dereference when the VTS test is
torn down. This CL adds a check before the cleanup.

Test: mm -j40
Bug: 63711002
Change-Id: I11a226a78b31444e7b198b2ff1dfa3794963caa0
2017-07-14 20:47:14 +00:00
Timur Iskhakov
d19838d2c4 Interface for configureRpcThreadpool tests
am: 16a0437ab3

Change-Id: Ie8c58380704d5a007566491e53d415ee5e14bbc1
2017-07-14 20:16:20 +00:00
Timur Iskhakov
16a0437ab3 Interface for configureRpcThreadpool tests
Test: links, compiles
Change-Id: I58996c4eeba5889c73407b1d71f03638b23d73d1
Merged-In: I58996c4eeba5889c73407b1d71f03638b23d73d1
2017-07-13 17:18:51 -07:00
sqian
83c6f03d59 Add radio 1.1 vts test folder.
am: c673a94a96

Change-Id: I9800dbb5789cc0db8df5ab2a31bdab50e016d618
2017-07-11 21:29:39 +00:00
sqian
c673a94a96 Add radio 1.1 vts test folder.
Bug: 38034125
Test: compile; adb shell compiled_vts_binary
Change-Id: I05d4f03db40ac712f120ac0e3e52301a6252f041
Merged-In: I05d4f03db40ac712f120ac0e3e52301a6252f041
2017-07-10 16:25:31 -07:00
Myles Watson
517186aec1 Merge "Bluetooth: Change CHECK() to LOG_ALWAYS_FATAL()"
am: 1a31a9e45e

Change-Id: I1fbef8d12e61c55bd5aa4b53378672aa6a5a54f7
2017-07-07 03:24:53 +00:00
Treehugger Robot
1a31a9e45e Merge "Bluetooth: Change CHECK() to LOG_ALWAYS_FATAL()" 2017-07-07 03:18:41 +00:00
Android Build Merger (Role)
b48a8a219f Merge "Merge "Make RawAddress into a class (4/4)" am: 1bd5a3ff87" into stage-aosp-master 2017-07-07 01:37:41 +00:00
Jakub Pawlowski
8f5aa9ae61 Merge "Make RawAddress into a class (4/4)"
am: 1bd5a3ff87

Change-Id: I71e7ef4a55a3dd570ec6f5056190493e3bb85168
2017-07-07 01:36:05 +00:00
Jakub Pawlowski
ef5d1b0209 Merge "Make RawAddress into a class (4/4)"
am: 1bd5a3ff87

Change-Id: I619d560145d6d4058be35de74bc4ded503da455e
2017-07-07 01:34:39 +00:00