Commit Graph

693 Commits

Author SHA1 Message Date
Chris Phoenix
26ae7f4613 consumerir HAL uses "default" service name
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds; verify HAL still works

In support of b/33844934

Change-Id: Ie7394569d20afba0228f01830385eb598795c831
Merged-In: I1b3b021aaa98ce99560126ddd277caa427ddf151
2017-01-18 17:18:23 -08:00
Andre Eisenbach
742c4db343 Merge "Bluetooth HAL uses "default" service name" 2017-01-18 21:48:01 +00:00
Treehugger Robot
ae548da7d4 Merge "supplicant(vts): Add gtest framework" 2017-01-18 21:44:50 +00:00
Chris Phoenix
b5558e3de1 Bluetooth HAL uses "default" service name
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds; verify HAL still works

In support of b/33844934

Change-Id: Icc006a71b41bcd03fe4a04ee92503e76ff07cd77
2017-01-18 21:29:50 +00:00
Steven Moreland
42e5d322af Merge "Adding all nfc vts related things back." 2017-01-18 21:29:12 +00:00
Roshan Pius
522e62d54b supplicant(vts): Add gtest framework
Bug: 33457575
Test: adb push
out/target/product/angler/data/nativetest/supplicant_hidl_test/supplicant_hidl_test
/data/ &&  adb shell /data/supplicant_hidl_test
Change-Id: I8b560483166822a33b8d81433178fdbc6077ec11
2017-01-18 12:02:13 -08:00
Andre Eisenbach
9041d97812 bluetooth: Add initialization completed callback
Test: bluetooth_hidl_hal_test
Bug: 31972505
Change-Id: I64c19a7fe7299079c5daf74e7b238b0d71d65db2
2017-01-18 19:38:57 +00:00
Steven Moreland
70f34a6330 Adding all nfc vts related things back.
Test: none
Merged-In: I84a42ae27d36a5479f2ca859849bb1b4536bdbad
Change-Id: I84a42ae27d36a5479f2ca859849bb1b4536bdbad
2017-01-18 11:15:11 -08:00
Roshan Pius
ab16b319f4 Merge "wifi: Add capabilitiy flag for ND offload" 2017-01-18 15:33:47 +00:00
Treehugger Robot
342658139f Merge "supplicant(interface): Add interface for WPS" 2017-01-18 05:58:37 +00:00
Yifan Hong
5835d9ea59 Merge "Add test for type resolution." 2017-01-17 21:03:05 +00:00
Roshan Pius
656f82054a wifi: Add capabilitiy flag for ND offload
Bug: 34224734
Test: Compiles
Change-Id: If4e6303fdff792a9dd576551fd84a741d8183798
2017-01-17 12:59:55 -08:00
Roshan Pius
08e6bbacf2 supplicant(interface): Add interface for WPS
Add the methods/callbacks required for WPS functionality through
wpa_supplicant.

Bug: 34198758
Test: Compiles
Change-Id: Iff1450621a4b039307ad6098f98326c35e53d4c6
2017-01-17 08:28:46 -08:00
Martijn Coenen
0bb0ba5f79 Merge "Testing struct that has vector of other struct" 2017-01-16 14:48:11 +00:00
Treehugger Robot
31265c5312 Merge "Add a new method to trigger a blocking read." 2017-01-14 08:07:25 +00:00
Hridya Valsaraju
586bed1c17 Add a new method to trigger a blocking read.
The new method will request the service to trigger a blocking
read with the default Event Flag notification bitmask defined
by the MessageQueue class.

Test: FMQ unit tests
Change-Id: I5a61e2b4527ba31cd5ea6521c553a87904af8056
2017-01-13 20:58:17 -08:00
Steven Moreland
7c8d9bbaf1 Revert "move VTS HIDL HAL tests to the corresponding interface directories"
This reverts commit ec7746fa80.

Test: no test
Merged-In: I9ec4493403d71419df99fe9761211eab057cdb0a
Change-Id: I39f2acaa5ee376b90bcddd0891ac6f309cb40a2b
2017-01-14 00:20:11 +00:00
Treehugger Robot
147abafc18 Merge "supplicant(interface): Fix a typo in documentation" 2017-01-13 19:05:01 +00:00
Yifan Hong
97973c69c8 Add test for type resolution.
Test: make hidl_test

Bug: 31971432

Change-Id: I5c058079d54e1b480f21550a76ccfd53f54bd0c4
2017-01-13 10:11:08 -08:00
Roshan Pius
5f1f3557aa Merge changes Ia9b1d24c,I86980cd2
* changes:
  wifi: Add keep alive packet sending functionality
  wifi: Add nd offload functionality
2017-01-13 16:46:15 +00:00
Pavel Maltsev
af9aec427d Testing struct that has vector of other struct
Test: hidl_java_test

Bug: b/34255213
Change-Id: I6a861f0fec32d5f7d541860bfe7bc3a45d37f1be
2017-01-13 11:35:36 +01:00
Martijn Coenen
9e172b30c7 Merge "Load legacy NFC libhardware HAL by correct name." 2017-01-13 08:35:40 +00:00
Ruchi Kandoi
aeb3de7b3f Merge changes from topic 'port-nfc-vts-AOSP'
* changes:
  Fix VTS paths on 32-bit target
  Remove obsolete references to IPCThreadState/ProcessState.
  Update Android.bp of Nfc with make rule for profiler.
  Use lowercase booleans in VTS test configs.
  Update to use the correct logging library.
  Update coverage configs with new format.
  Update NFC VTS configs to reflect new source paths
  increase the timeouts to 10mins for nfc target-side tests
  enable profiling directly from AndroidTest.xml
  NFC: vts: Update VTS driver files as per HAL changes
  NFC: Add target-side VTS tests for NFC
  use svc nfc enable/disable which is always the same.
  move VTS HIDL HAL tests to the corresponding interface directories
  Build target-side NFC test with coverage.
  Remove -DENABLE_TREBLE from vts test LOCAL_CFLAGS.
  Nfc: Split libhidl into base and transport.
  NFC: Update vts files to include the Annotations.
  NFC HAL target-side test (template)
  Update vts files for nfc hidl file style change.
  VTS driver build target for NFC 1.0
  add nfc vts files and vts profiler build rule
2017-01-12 23:13:44 +00:00
Roshan Pius
43a4e12d9a supplicant(interface): Fix a typo in documentation
Bug: 33470645
Test: Compiles
Change-Id: I79789f64610ab7196b32794f4a7c264a2d9d7a8b
2017-01-12 12:51:26 -08:00
Hsin-Yi Chen
dd716c36f2 Fix VTS paths on 32-bit target
Decide target_basepaths by device's bitness.
On 32-bit target, do not include */lib64.

Bug: 33930594
Test: vts-tradefed run commandAndExit vts -m VibratorHidlTest -l INFO
Change-Id: I340ded1d763dc194da461ecf183c6a2ff5f5ee6f
(cherry picked from commit 23bd70d552)
2017-01-12 11:02:23 -08:00
Martijn Coenen
b4b3c93eaa Remove obsolete references to IPCThreadState/ProcessState.
Threadpool can now be configured/joined if needed with
configureRpcThreadpool() / joinRpcThreadpool().

Bug: 31226656
Test: mma
Change-Id: I0d7d9924cc8c8851cc2b61ebdae906204909890e
(cherry picked from commit 028223775b)
2017-01-12 11:02:23 -08:00
Zhuoyao Zhang
dcfe5d667e Update Android.bp of Nfc with make rule for profiler.
Bug:31930023
Test: mma
Change-Id: I4e159d4f0b37fdd4738cdee354c4fe05406baa02
(cherry picked from commit 42a6dddd4a)
2017-01-12 11:02:23 -08:00
Ryan Campbell
63ff734724 Use lowercase booleans in VTS test configs.
Use lowercase booleans so that they can be parsed in Java
and Python.

Test: run vts -m HalNfcHidlTargetBasicTest
Change-Id: I16e2f417047219a88d49ed5b0651639a0cc2bf61
(cherry picked from commit 9fc3c47bc7)
2017-01-12 11:02:23 -08:00
Ruchi Kandoi
6b6003620b Update to use the correct logging library.
Test: Compiles
Merged-Id: Idb33dea5faaf1a5e54719c2a5a683d2d47e9b8e8
Change-Id: Ib770cbc75bc10a04d93d9370ec341054e3d8dd57
Cherry-picked from f9d303435d
2017-01-12 11:02:22 -08:00
Ryan Campbell
ae87d5a100 Update coverage configs with new format.
Update config files to specify coverage modules and git projects
in the new format.

Test: pass
Change-Id: If58fce01d6e0fbc458653709e373e59ad976f4ae
(cherry picked from commit 54604102b5)
2017-01-12 11:02:22 -08:00
Ryan Campbell
99f201ac11 Update NFC VTS configs to reflect new source paths
Specify the new locations of NFC source code for use when
displaying coverage results.

Test: pass
Change-Id: I32d9b2e58ded1be3739e3cc24cf17c519a6a1d94
(cherry picked from commit ea4f71faba)
2017-01-12 11:02:22 -08:00
Keun Soo Yim
4fbf78481e increase the timeouts to 10mins for nfc target-side tests
Test: local direct binary runs (1.5mins on average)
Change-Id: Id85633a6a4a55a9d6876142447521146cd6e57f3
(cherry picked from commit c029996117)
2017-01-12 11:02:22 -08:00
Yuexi Ma
12b532c8f3 enable profiling directly from AndroidTest.xml
Test: local
Change-Id: If13be820766f54ff154f350cbbacbab9dffe07d2
(cherry picked from commit aa61067c14)
2017-01-12 11:02:22 -08:00
Ruchi Kandoi
891d843b8c NFC: vts: Update VTS driver files as per HAL changes
The return types for the NFC HAL have changed, this patches updates the
VTS driver files.

Test: Test Passes
Bug: 32748647
Change-Id: Ic31d25c3d6b4a1db05e2e481a948a7547b30f2d7
Singed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
(cherry picked from commit d9b830ff9b)
2017-01-12 11:02:22 -08:00
Ruchi Kandoi
ea37e1ab66 NFC: Add target-side VTS tests for NFC
Test: Test Passes
Change-Id: I393ca24e86447571a92e3742716fdc6f1ddc0519
Signed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
(cherry picked from commit 1488dd7ff0)
2017-01-12 11:02:22 -08:00
Keun Soo Yim
a0bf597885 use svc nfc enable/disable which is always the same.
Test: run vts-hal-hidl
Change-Id: I347ff0ad92dfc39c9b97fefb8afb4d05aa883aa5
(cherry picked from commit e977d80bb0)
2017-01-12 11:02:22 -08:00
Keun Soo Yim
ec7746fa80 move VTS HIDL HAL tests to the corresponding interface directories
Bug: 32783461
Test: vts-tradefed; run vts-hal-hidl
Change-Id: Iead44eaf65dcd4de2286267467c4a4a322a88205
(cherry picked from commit 8a36c0b01c)
2017-01-12 11:02:22 -08:00
Ryan Campbell
7da37f4320 Build target-side NFC test with coverage.
Instrument NFC test with coverage so that coverage can be collected
on NFC implementation.

Test: make vts
Change-Id: I30c082198a027bc02ecaaf3232ce5935010b398d
(cherry picked from commit 89aeb505fe)
2017-01-12 11:02:22 -08:00
Steven Moreland
be1badc30a Remove -DENABLE_TREBLE from vts test LOCAL_CFLAGS.
I went ahead and removed some no-ops from the mk's.

Bug: 32978887
Test: mma -j64
Change-Id: I6f8341332aa9f249912f6a8b3a3664b76d362e99
(cherry picked from commit 2b2cef2864)
2017-01-12 11:02:22 -08:00
Yifan Hong
1ee9859640 Nfc: Split libhidl into base and transport.
Bug: 32756130

Test: mma
Merged-In: Id21cf23abe2910f26bb7895511862443b93dc112
Change-Id: I8379d8af9c373b489f803c3ae9129227a78537a6
(cherry picked from commit 6b920e43d3)
2017-01-12 11:02:14 -08:00
Steven Moreland
6de0aa81a3 MemoryTest: add method for testing
Bug: 34134129
Test: compiles
Change-Id: If0d2a9c00f93f548da5e9261a93d4715412620c3
2017-01-12 16:27:43 +01:00
Martijn Coenen
ce2e6569dc Load legacy NFC libhardware HAL by correct name.
Use NFC_NCI_HARDWARE_MODULE_ID, which maps to "nfc_nci",
and is correct for the PN54x HAL (which is the only
remaining HAL implementation in use).

Test: NFC works
Change-Id: Ida810ec990ddb4f71756225fffb3fc2757e76374
2017-01-12 10:42:16 +00:00
Treehugger Robot
cb5989d239 Merge "Bp/n/sFoo -> Bp/n/sHwFoo" 2017-01-12 01:50:58 +00:00
Roshan Pius
9a9869a759 wifi: Add keep alive packet sending functionality
Bug: 34233272
Test: Compiles
Change-Id: Ia9b1d24cccf3ec6a09bbb6b6e9d1f4bc13623767
2017-01-11 17:04:31 -08:00
Roshan Pius
af727c0cc8 wifi: Add nd offload functionality
Bug: 34224734
Test: Compiles
Change-Id: I86980cd27ea97216c9431878bb9a922c8942b361
2017-01-11 16:43:38 -08:00
Treehugger Robot
818ffb15a6 Merge "liblog: use log/log.h when utilizing ALOG macros" 2017-01-11 15:22:55 +00:00
Ruchi Kandoi
6360a884b8 NFC: Update vts files to include the Annotations.
Bug: 32124874
Test: Compiles
Change-Id: I9b323350d2ab9e9acedd4ef85a27daeb5f671bd4
Singed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
(cherry picked from commit 140ccbc48c6bd05018fe79f5cc02dac7f3343a6f)
2017-01-10 19:00:32 -08:00
Keun Soo Yim
105bcaa066 NFC HAL target-side test (template)
Test: make vts; vts-tradefed; run -m HalNfcHidlTargetBasicTest
Change-Id: I021cfd916efc68fc9a4191f4aaa736f05c81c962
(cherry picked from commit 1d18b23e622fb6436a9f703eeb53c01a9ef732f6)
2017-01-10 18:59:38 -08:00
Zhuoyao Zhang
540a1ca37a Update vts files for nfc hidl file style change.
Test: make vts.
Change-Id: I2a86e9555f5e3ca0893d1e7b34f75ea68859af7e
(cherry picked from commit 0a38e46ef4692e459050b51339fb061662713fea)
2017-01-10 18:59:17 -08:00
Keun Soo Yim
3e78819754 VTS driver build target for NFC 1.0
Test: mma
Change-Id: Icc88b2bf79f2d2f23e908389c1e9d4994b439602
(cherry picked from commit dceef4931685e8556aa8f1127c45d745099b7d96)
2017-01-10 18:58:53 -08:00