Commit graph

169 commits

Author SHA1 Message Date
Steven Moreland
1ae4615d9f Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I1f69d292bc23a7cc293a66110cb02d597e1019ad
2019-04-17 09:38:50 -07:00
Steven Moreland
a878aee9ab Update makefies: no 'types'
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
Ruchi Kandoi
2664a4a8c5 Merge "Add android.hardware.nfc@1.2" 2019-01-04 19:56:41 +00:00
Ruchi Kandoi
668d4cd28e Add android.hardware.nfc@1.2
Extends the NfcConfig data type to
accomodate newer features.

Test: TBD
Bug: 117253962
Change-Id: I7e8a78e373da48e3c232adff53a03002079ffc0d
2018-12-07 15:24:16 -08:00
Keun Soo YIM
68ae05dd2d pack VTS cc_test binaries as general-tests
Test: make general-tests
Bug: 120093339
Merged-In: I363450d205868f900e4925ccff1430e2a569f2a4
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-12-07 10:49:56 -08:00
Ruchi Kandoi
c200342182 Add defaultSysCodePowerState in types.hal in NFC 1.1
Test: Nfc Enable/Disable; test if config is read in logcat
Bug: 77496460
Change-Id: I13e21ba18c03c3c7b9eff3aa67e843e7f063b233
2018-04-02 17:52:50 -07:00
Ruchi Kandoi
0f0743a503 Add VTS Test for getConfig() in NFC 1.1
Test: run VtsHalNfcV1_1TargetTest
Bug: 72080121
Change-Id: I89600b54d64d4f274647ab4426faf5e05b2f3d34
Merged-In: I89600b54d64d4f274647ab4426faf5e05b2f3d34
(cherry picked from commit 7fb95e3b56cfb53835cc37d3333eff7574371671)
2018-03-09 22:05:17 +00:00
Ruchi Kandoi
61a53d98b6 NFC 1.1: Add getConfigs() method
Test: Boot and check Nfc configs initialized
Bug: 72080121
Change-Id: I000cea4491b2bd136b9ece232b9d73293804c733
(cherry picked from commit 0fc60e41a2f523fb025111fcbce064d9c7a7d4cc)
2018-03-09 22:05:04 +00:00
Zhuoyao Zhang
d776f7d1dc Merge "Convert nfc hal test to use VtsHalHidlTargetTestEnvBase" am: 3ddc39293b am: 3cc658c11e
am: ae709891ab

Change-Id: I251b1c44adefd8e8e5cb0b341abfff5ce20ca3db
2018-02-16 00:16:56 +00:00
Zhuoyao Zhang
b4744d1460 Convert nfc hal test to use VtsHalHidlTargetTestEnvBase
Bug: 64203181
Test: make vts
      vts-tradefed run vts -m VtsHalNfcV1_0Target

Change-Id: I7a66c98507811ea4f4a18a8e08476878dfd59748
2018-02-10 12:44:54 -08:00
Ruchi Kandoi
3e0950b16c Merge "Add NFC 1.1 VTS Test" am: bf81fc584b am: 8e0c79dffd
am: 0120901735

Change-Id: I792e43cbd6b221507ec7c6635d2969bc0dc9ebee
2018-02-04 23:22:11 +00:00
Ruchi Kandoi
912ce33eeb Add NFC 1.1 VTS Test
Test: Run VtsHalNfcV1_1TargetTest
Bug: 72746517
Change-Id: I11db8782e89fe06a33d9d7b56d3270b0ad0341cd
2018-02-02 16:53:00 -08:00
Ruchi Kandoi
a0dc2c9089 Add NFC HAL 1.1 am: 4475917d65 am: 6fa5f5bbfd
am: ac564248bc

Change-Id: I8a54f823d3b754753cfe804d8d60755aa09a67bb
2018-02-02 06:54:22 +00:00
Ruchi Kandoi
4475917d65 Add NFC HAL 1.1
Adds factoryReset(). This must be used by the HAL to clear the chip and
use the do a full initialization at the next init.

Adds closeForPowerOffCase(). There are vendor specific
configurations that are need during NFC power off to enable low battery
and power off use cases. This will distinguish cases where the user
turns NFC off because they do not want to use NFC and NFC is turned off
as a result of device switched off.

HCI_NETWORK_RESET event has been added to indicate something went wrong
on the firmware level and HCI network needs to be re-initialized.

Bug: 70294869
Bug: 70294551
Test: Run VtsHalNfcV1_1TargetTest
Change-Id: Ib981a56ac94e06b74bd901a159791f09ea16483a
2018-02-01 16:32:07 +00:00
Steven Moreland
7b9888217e Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 17:19:46 -08:00
Steven Moreland
fcca4e23b7 Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:22:43 -08:00
Steven Moreland
8db261bc99 Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 10:00:18 -08:00
Treehugger Robot
0f2eb8b2ee Merge changes from topic "hidl-soong-plugin"
* changes:
  Update makefiles for hidl_interface.
  Update makefiles for transitive interfaces.
2017-11-11 02:31:20 +00:00
Ruchi Kandoi
086107d911 Merge "Remove strong pointer in contructor to "this"" am: 62ab659b28 am: 5883f33628
am: 253c1e99a7

Change-Id: I06c57b367398eda4ea502f762d261f70d03eacdf
2017-11-10 21:58:22 +00:00
Ruchi Kandoi
461deddb4d Remove strong pointer in contructor to "this"
Bug: 69110631
Test: NFC on/off
Change-Id: I6c0173df6b6f49e7c07e9670c827b2944c6fe23f
2017-11-10 09:32:30 -08:00
Steven Moreland
a1169dd600 Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
2017-11-10 09:06:55 -08:00
Steven Moreland
1d7374c5e1 Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1
am: 116161d94e

Change-Id: I33643636e2511de77fdf7de57777eb67edee2e52
2017-10-11 16:39:21 +00:00
Steven Moreland
c3e80fa01e Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Steven Moreland
9b019ac4fe Merge "Remove useless Android.mk files." am: 75d5cf515a am: f27cfa15d7 am: 33dc30ce49
am: 0653f3b212

Change-Id: I7c2da3cf30da7b4a1eda7e5369e9caa5ebab2462
2017-10-05 21:52:50 +00:00
Treehugger Robot
75d5cf515a Merge "Remove useless Android.mk files." 2017-10-05 21:40:27 +00:00
Steven Moreland
4b60470f1a Remove useless Android.mk files.
These have been c/p'd all over the place.

Test: m -j nothing
Bug: 33420795
Change-Id: I77979866dbb2345a41a873c84ec3fccd7b127510
2017-10-04 15:52:40 -07:00
Steven Moreland
70bfb9d250 Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f am: b53e6ad535
am: 9a17f41f6f

Change-Id: I78d9292068b372238554fd9d35128e69f5b5f9d2
2017-10-04 21:54:11 +00:00
Treehugger Robot
988c977079 Merge "Update for hidl adapter module defaults." 2017-10-04 21:36:25 +00:00
Chih-hung Hsieh
bf5e381a8b Merge "Use -Werror in hardware/interfaces" am: 85bb01dd6b am: 3ed04cd35d am: baf19e17b3
am: 9890348480

Change-Id: Iadec8caae33b04a8cef45532fc2c940a8be23cea
2017-10-04 21:23:09 +00:00
Steven Moreland
527fd76a0e Update for hidl adapter module defaults.
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Chih-Hung Hsieh
3da5b01946 Use -Werror in hardware/interfaces
* Remove unused local variables.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I48dbbf670cc9eeff2391983788983420f8547cc9
2017-10-04 11:16:31 -07:00
Steven Moreland
91799c6cc7 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3 am: 71a193a425
am: 9fdd241905

Change-Id: I1c852fa6600fecc44d5afd1a65a5f51c43ecf71c
2017-09-27 00:02:52 +00:00
Steven Moreland
a5299ee739 Fix typo in update makefiles.
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00
Steven Moreland
7741c0e17b Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e am: b94d0c7290
am: 97228c0b7d

Change-Id: Ic4b459b7c1a4325453945b0b00db8f44e4e77c26
2017-09-26 13:36:09 +00:00
Steven Moreland
26a0bb2762 Update makefiles for hidl adapter.
Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
2017-09-25 18:35:56 +00:00
Jaekyun Seok
81104ae5ef Add 'vendor.' prefix to a vendor HAL service name
To prevent property name collisions between properties of system and
vendor, 'vendor.' prefix must be added to a vendor HAL service name.
You can see the details in http://go/treble-sysprop-compatibility.

Test: succeeded building and tested on a walleye device
Bug: 36796459
Change-Id: I4e8fbee791ec917a8f627a1366f4d44ec7e6febc
2017-09-12 08:01:42 +09:00
Steven Moreland
6da35570df Updating all makefiles.
Bug: 64487114
Test: none
Change-Id: I8608c8f636c35f21e4246a805a9eff6d14124e0a
2017-08-10 23:43:46 +00:00
Myles Watson
9e8b857bfd NFC: Add OWNERS file for default/ am: 31439b1d24 am: 3a43fa5115
am: e32a2e3f9a

Change-Id: Icc832424e38bb1e00f9fc821dde81f2c73d6be62
2017-08-09 20:38:31 +00:00
Steven Moreland
65de66a67e Update makefiles for vndk enabled. am: 5e59402492 am: 271d53d836
am: 148ca84740

Change-Id: I5ef3611026b9c770bf713c14b9e01899a796e61c
2017-08-09 20:36:43 +00:00
Myles Watson
31439b1d24 NFC: Add OWNERS file for default/
Test: build
Change-Id: I6e854923fdd66991bcc7ed3446106d148abea982
2017-08-09 18:33:57 +00:00
Steven Moreland
5e59402492 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Merged-In: I29174fdadca2828455ef49f14e53bc95c5238dbb
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
(cherry picked from commit c716b8c307)
2017-08-08 17:09:10 +09: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
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
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
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
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
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
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
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
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