Commit graph

144 commits

Author SHA1 Message Date
Myles Watson
1c4fc17536 NFC: Add OWNERS file for default/
am: a4d1a74700

Change-Id: I43572572901298d1e915c9753798361bdd5d38c2
2017-08-10 00:38:46 +00:00
Myles Watson
a4d1a74700 NFC: Add OWNERS file for default/
Test: build
Change-Id: I6e854923fdd66991bcc7ed3446106d148abea982
(cherry picked from commit 31439b1d24)
2017-08-09 14:26:22 -07:00
TreeHugger Robot
d9b12c13e5 Merge "Update makefiles for vndk enabled." into oc-mr1-dev 2017-08-04 00:52:06 +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
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
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
Steven Moreland
c716b8c307 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
2017-08-02 18:00:14 -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
Ruchi Kandoi
ec553ff9a7 Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev
am: 55f3ddf53b

Change-Id: I4a925e2c92572b20e85b8a6604d3af6e7f8f30ea
2017-06-19 16:39:05 +00:00
Ruchi Kandoi
a915c5a240 Nfc: Vts: modify WriteInvalidAndThenValidCommand
Invalid Data packets are ignored by the NFC controller in case there
isn't an active RF Interface. The test expects response for the invalid
data packet without any active RF Interface. This patch modifies the
test to send an invalid command instead which will guarantee a response.

Test: run vts test
Bug: 62400568
Change-Id: I7db1d5209b6ef2240ac248f3aba0e27e0a285018
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-06-16 19:58:18 +00:00
Ruchi Kandoi
36193658d2 Nfc: Vts: modify WriteInvalidAndThenValidCommand
Invalid Data packets are ignored by the NFC controller in case there
isn't an active RF Interface. The test expects response for the invalid
data packet without any active RF Interface. This patch modifies the
test to send an invalid command instead which will guarantee a response.

Test: run vts test
Bug: 62400568
Change-Id: I7db1d5209b6ef2240ac248f3aba0e27e0a285018
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
(cherry picked from commit c86df4dcb74224ea7befc2cb610e43d0df6814ae)
2017-06-16 12:53:45 -07:00
Ruchi Kandoi
ada528db46 Merge "Support NCI 2.0 for NFC VTS" into oc-dev
am: 5ed63181a9

Change-Id: I65cd9c3d9818871130eea5351f02d655bac44988
2017-06-15 23:06:12 +00:00
Ruchi Kandoi
d695ccfa5d Support NCI 2.0 for NFC VTS
Bug: 62322170
Test: Run vts test
Change-Id: I7ed331dac9d5918675c091620f099b6250e20700
(cherry picked from commit ff8068d160)
2017-06-12 17:10:55 -07:00
Ruchi Kandoi
ff8068d160 Support NCI 2.0 for NFC VTS
Bug: 62322170
Test: Run vts test
Change-Id: I7ed331dac9d5918675c091620f099b6250e20700
2017-06-12 16:21:44 -07:00
Steven Moreland
e4d318948a Update makefiles.
Adds default configuration to all hals.

Test: pass
Merged-In: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
Change-Id: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
2017-05-19 15:53:53 -07:00
Steven Moreland
06c85d986a Update makefiles.
Adds default configuration to all hals.

Test: pass
Change-Id: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
2017-05-18 16:14:16 -07:00
Ruchi Kandoi
8e3c66e28b NFC: vts: Add commands to reset the NFC controller before other commands
Bandwidth and WriteInvalidAndThenValidCommand test assumes that the NFC
controller will be initialized before the test. This is not necessarily
true for all devices. Send CORE_RESET_CMD and CORE_INIT_CMD before
creating a loop-back connection.

CORE_RESET_RSP doesn't necessary return the configuration that was sent
in CORE_RESET_CMD. For instance, if CORE_RESET_CMD requested keeping
the configuration, and if the controller doesn't support that, the
configuration will be resetted and CORE_RESET_RSP will reflect that.

Bug: 38267593
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
      --primary-abi-only --skip-preconditions
      --module VtsHalNfcV1_0Target -l INFO
Change-Id: I65ae9746054ca767b928bdd461faa02f03719aea
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
(cherry picked from commit 209a274c31)
2017-05-15 20:39:11 +00:00
Ruchi Kandoi
209a274c31 NFC: vts: Add commands to reset the NFC controller before other commands
Bandwidth and WriteInvalidAndThenValidCommand test assumes that the NFC
controller will be initialized before the test. This is not necessarily
true for all devices. Send CORE_RESET_CMD and CORE_INIT_CMD before
creating a loop-back connection.

CORE_RESET_RSP doesn't necessary return the configuration that was sent
in CORE_RESET_CMD. For instance, if CORE_RESET_CMD requested keeping
the configuration, and if the controller doesn't support that, the
configuration will be resetted and CORE_RESET_RSP will reflect that.

Bug: 38267593
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
      --primary-abi-only --skip-preconditions
      --module VtsHalNfcV1_0Target -l INFO
Change-Id: I65ae9746054ca767b928bdd461faa02f03719aea
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-05-15 17:12:49 +00:00
Steven Moreland
8716f3063e Update makefiles for c++-sources and c++-headers.
Test: pass
Bug: 38174080
Merged-In: I683455736eed35e6ced24e2763c2bdb5fb6c9601
Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601
2017-05-09 19:58:45 -07:00
Steven Moreland
cb360c60d8 Update makefiles for c++-sources and c++-headers.
Test: pass
Bug: 38174080
Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601
2017-05-09 14:34:19 -07:00
Treehugger Robot
62769b7196 Merge "Remove redundant dependencies" 2017-05-01 23:19:25 +00:00
Steven Moreland
ee1d248ae2 Remove redundant dependencies
android.hidl.base@1.0 and android.hidlmanager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I424371932af129bba9d58dcf8652c64297f35f05
2017-05-01 09:47:58 -07:00
Steven Moreland
238dd8a83c nfc: Android.mk -> Android.bp
Test: links
Change-Id: Ia19dafb3ff6bf5772d72133bb2e1687226e0d44f
2017-04-29 01:21:24 +00:00
Hung-ying Tyan
b422f16e23 Remove dependency of libhardware_legacy
It is not used by bluetooth and nfc services.
Bug: 33241851
Bug: 37305530
Test: built and tested on sailfish

(cherry picked from commit 593eeb7a4b)

Change-Id: I599073296baa5eee72a1fce8caa4eb8352f66218
Merged-In: I599073296baa5eee72a1fce8caa4eb8352f66218
2017-04-19 22:45:32 +00:00
TreeHugger Robot
ba2420a87f Merge "Remove dependency of libhardware_legacy" into oc-dev 2017-04-17 03:05:10 +00:00
Hung-ying Tyan
593eeb7a4b Remove dependency of libhardware_legacy
It is not used by bluetooth and nfc services.
Bug: 33241851
Bug: 37305530
Test: built and tested on sailfish

Change-Id: I599073296baa5eee72a1fce8caa4eb8352f66218
Merged-In: I599073296baa5eee72a1fce8caa4eb8352f66218
2017-04-15 13:43:36 +08:00
Andreas Huber
6fa374ad30 Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I177f4cfd42f635aaf096107af8309d1a82ed41c0
Merged-In: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 15:23:46 -07:00
Andreas Huber
6733baff6c Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I177f4cfd42f635aaf096107af8309d1a82ed41c0
Merged-In: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 15:16:27 -07:00
Steven Moreland
0dd5ba23fb Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 16:41:07 -07:00
Steven Moreland
b2799c370f Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 09:57:40 -07:00
Ruchi Kandoi
8a7ac5d399 nfc: vts: Correct parameters going for CoreInitialized
Core Initialized with parameters 1-3 leads the device into recovery
mode. Which causes the test to fail.

Bug: 36751759
Change-Id: If2b91237a445ce050b7da6be5f97dd8eea30046e
Merged-In: I1375546cc66c147f26c315a042ca0afb49f0ce06
Test: Test passes
2017-04-04 00:48:43 +00:00
Ruchi Kandoi
9150025076 nfc: vts: Correct parameters going for CoreInitialized
Core Initialized with parameters 1-3 leads the device into recovery
mode. Which causes the test to fail.

Bug: 36751759
Test: Test passes
Change-Id: I1375546cc66c147f26c315a042ca0afb49f0ce06
2017-04-03 22:44:21 +00:00
Yuexi Ma
859f18bec0 NFC VTS test use VtsHalHidlCallbackBase for callback wait and notify
VtsHalNfcV1_0TargetTest uses VtsHalHidlCallbackBase.
Callback class extends VtsHalHidlCallbackBase and use waitForCallback and notifyFromCallback

The original NFC test contains the following use cases:
  * Callback notify happens before wait
  * Multiple waiting in serial
The modified version added the following use cases:
  * Wait for specific callback function
  * Passing callback arg data along wait and notify functions

Bug: 36036059
Test: make VtsHalNfcV1_0TargetTest, adb push & adb shell
Change-Id: Ic6668a18254661d07c4ff37309cd96ea5f786d29
(cherry picked from commit bfefc5ef10)
2017-04-02 16:53:39 -07:00
Yuexi Ma
bfefc5ef10 NFC VTS test use VtsHalHidlCallbackBase for callback wait and notify
VtsHalNfcV1_0TargetTest uses VtsHalHidlCallbackBase.
Callback class extends VtsHalHidlCallbackBase and use waitForCallback and notifyFromCallback

The original NFC test contains the following use cases:
  * Callback notify happens before wait
  * Multiple waiting in serial
The modified version added the following use cases:
  * Wait for specific callback function
  * Passing callback arg data along wait and notify functions

Bug: 36036059
Test: make VtsHalNfcV1_0TargetTest, adb push & adb shell
Change-Id: Ic6668a18254661d07c4ff37309cd96ea5f786d29
2017-04-01 23:36:14 -07:00
Andreas Huber
675ae49ab1 Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: make
Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40
2017-03-28 16:14:43 -07:00
Andreas Huber
3e4acb8b3a Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: make
Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40
2017-03-28 16:10:42 -07:00
Steven Moreland
e90c31f125 Update makefiles.
Test: pass
Change-Id: I925baccbe51a32b7b7f3f66cf2918d017ee6b039
2017-03-24 21:50:45 -07:00
Ruchi Kandoi
ee8314cd7a Nfc: Null ptr checks in HAL
Adds null pointer checks in the default implementation.

Test: compiles
Bug: 36149477
Change-Id: I6195ce92f5cefd4b82874866d08014830f400192
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-03-22 16:47:48 -07:00
Yuexi Ma
6b8720110b Change vts target base test class name
Test: make vts succeed, vts kernel tests and nfc hal tests passed
Change-Id: I38ae6cc940d0f17bb3352f360efdf9c70697c76b
2017-03-10 00:42:13 -08:00
Steven Moreland
691a455b9f Add hidl_default and make modules use hidl_default.
find hardware/interfaces -type f -not -path "*/.git/*" \
-exec sed -i -e '/cc_[A-Za-z_]\+/ { N; s/$/\n    defaults:
\["hidl_defaults"\],/ }' {} \;
./hardware/interfaces/update-makefiles.sh

Test: no warnings
Bug: 35840847
Change-Id: I468b76893bf3f4b62ad610d1d9603bcb8797a702
2017-03-08 16:22:00 -08:00
Ruchi Kandoi
3d7c5f974c Add Test cases to Nfc VTS
- Call close() after close()
- Call open() after open()
- Call powerCycle() after close()
- Call preDiscover() after close()
- Call controlGranted() after close()
- Call coreInitialized() with different data

Test: VTS test passes
Bug: 32024301
Change-Id: I7cd986887ccbf2774d5eace9c975a9a55ee46364
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-03-06 17:03:08 -08:00
Yuexi Ma
93d2541aae Add columns to namespace for vts target base test invocation
Test: make vts
Change-Id: Ia0284fbc11eadef572dd510bb5847160852bd517
2017-02-28 20:49:00 +00:00
Yuexi Ma
178dfd5e29 change all vts hidl tests to use VtsHalHidlTargetBaseTest
Bug: 33385836
Test: mma
Change-Id: I660d6e0fce6422d87d4b227273a77c95d20ed3f2
2017-02-28 07:59:59 +00:00
Steven Moreland
d28a3dce40 Remove viral dependency on libhwbinder.
find hardware/interfaces -name Android.mk -exec sed -i -e '/libhwbinder
\\/d' {} \;
find hardware/interfaces -name Android.bp -exec sed -i -e
'/"libhwbinder"/d' {} \;
./hardware/interfaces/update-makefiles.sh

Test: everything links
Test: (sanity) booted marlin on internal master with these changes
Bug: 35710429
Change-Id: I6b0b5ae318422b7a9be17a19a79e039ffc0f9272
2017-02-24 12:01:06 -08:00
Martijn Coenen
85ca130527 Nfc: deal with the framework going away.
By calling close() when the framework client dies.

Bug: 35624326
Test: NFC HAL stays alive and works after com.android.nfc is killed
Change-Id: I91fcf6685783cd630a44d19b4cb99127a2c0e89b
2017-02-23 17:54:46 +00:00
Tri Vo
81f9968c71 Remove .vts spec files.
Test: mmma hardware/interfaces
Change-Id: Iabbcd336d37ceb58ea4cc649ee5c104424494513
2017-02-21 15:55:00 -08:00
Zhuoyao Zhang
f7693eed97 Update the test binary and source file name.
* To confirm with Vts naming convention.

Bug: 35273456
Test: mma
Change-Id: Ide6d9d15618e65d8cb74363f3a8acd52609cd0dd
2017-02-17 10:34:33 -08:00
Treehugger Robot
8cd0125d2e Merge "Remove --coverage in Android.bp" 2017-02-15 05:08:19 +00:00
Steven Moreland
46c0b94992 Move hidl shims to the vendor partition.
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.

Bug: 34135607
Test: marlin persist.hal.binderization on/off

Merged-In: I3f86c77c147514fe470f08088a66de312ae32d4e
Change-Id: I3f86c77c147514fe470f08088a66de312ae32d4e
2017-02-13 23:14:38 +00:00