Commit graph

36 commits

Author SHA1 Message Date
Steven Moreland
b3a4d3832e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
Felix
37298a7616 Merge "Add interface info to .rc files"
am: 98d0f4d52c

Change-Id: Ie6cfbacd523c4b09f77bee3369ec8e88b3fa0419
2019-07-08 12:22:23 -07:00
Felix
551b8d15ce Add interface info to .rc files
Signed-off-by: Felix <google@ix5.org>
Change-Id: I6d70bbdb66c3dce280bf6908c3750316a6f6cf70
2019-06-25 20:00:07 +02:00
Raj Mojumder
0cd000e5ce NFC: Update OWNERS for default/
BUG: 0
Test: gerrit upload
Change-Id: Idd1f901f3a58b5646f620c676cada0de5af9fc89
Signed-off-by: Raj Mojumder <rmojumder@google.com>
Exempt-From-Owner-Approval: Invalid owners.
2019-04-10 22:39:48 +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
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
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
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
Myles Watson
31439b1d24 NFC: Add OWNERS file for default/
Test: build
Change-Id: I6e854923fdd66991bcc7ed3446106d148abea982
2017-08-09 18:33:57 +00: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
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
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
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
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
Chris Phoenix
3b06b22ed4 Nfc 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: Id7b76e1df98e1ecacb530a1b5fec76bf14ba6eb7
2017-01-18 15:51:05 -08: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
Mark Salyzyn
a4842ace39 liblog: use log/log.h when utilizing ALOG macros
Test: compile
Bug: 30465923
Change-Id: I67046a75be057e7905570748a1ed6bfd03c0e1c8
2017-01-10 15:02:14 -08:00
Yifan Hong
65cbd60e1f Update to use the correct logging library.
Test: compiles
Change-Id: Ia5030c4d7ef95c5878c6b320d5bc30041023728f
2016-12-01 15:58:37 -08:00
Ruchi Kandoi
51068e0bd3 Nfc: Change return types for Nfc hal to specified type.
Test: Compiles and test passes
Bug: 32998929
Change-Id: I6787b90e5e745b32c7a5a951203496cc614fdc10
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-11-29 01:14:26 +00:00
Steven Moreland
33e87b8a76 Remove HIDL_GENERATED from things written by hand.
find . -name "*.h" -exec sed -i 's/HIDL_GENERATED_\(.*\)_H_/\U\1_H/g' {}
+

They now match what would be generated by -Lc++-impl. This prevents
confusion over whether or not the files are autogenerated.

Test: pass
Change-Id: I2c9d7887f6d6bdaa19a5c4bfcf02ee3d1dbc81d1
2016-11-22 15:34:39 -08:00
Yifan Hong
63544eacb6 Split libhidl into base and transport.
Bug: 32756130

Test: mma
Change-Id: Id21cf23abe2910f26bb7895511862443b93dc112
2016-11-18 09:52:57 -08:00
Martijn Coenen
42eba0a071 NFC HAL doesn't need readproc.
Bug: 31928447
Test: NFC still works
Change-Id: I9f43192c33f3fdf91e4aa97d4c5e5fa49a01a85e
2016-10-28 17:09:22 +02:00
Steven Moreland
cc7d42bded Use defaultPassthroughServiceImplementation for nfc.
Bug: 32282345
Test: nfc
Change-Id: I4f45a3d4b91ccee2fcd0ca8fe599e090129a02e3
2016-10-19 14:51:59 -07:00
Treehugger Robot
e397b73792 Merge changes from topic 'nfc-style'
* changes:
  nfc: update default implementation to match style.
  nfc: reflect style guide.
2016-10-17 15:57:16 +00:00
Steven Moreland
a74426d691 nfc: update default implementation to match style.
Test: make android.hardware.nfc@1.0-impl
Change-Id: I00357d40df1a6b2289f86b33d7a5833e358884d6
2016-10-14 08:24:17 -07:00
Steven Moreland
7573963148 Cleanup nfc service code.
Test: mma
Change-Id: Ie65c5bfde292107bec567a297e86eebf5cd7fa41
2016-10-13 09:33:18 -07:00
Steven Moreland
6d4d412617 Revert "Revert "Revert "nfc: update default implementation to match style."""
This reverts commit 22be21e864.

Change-Id: I0534b0eb87623091685fa0e2d94d744d2aeaa4ca
2016-10-06 02:50:58 +00:00
Steven Moreland
22be21e864 Revert "Revert "nfc: update default implementation to match style.""
This reverts commit 3768be324b.

Change-Id: Ifecd3ac227af14b49eba83c1126d51996ce3b8f5
2016-10-05 15:46:37 +00:00
Steven Moreland
3768be324b Revert "nfc: update default implementation to match style."
This reverts commit 6b6381cb58.

Change-Id: I2891a4ea774ad0047d9f99074fe773808dae0f7c
2016-10-04 16:37:11 +00:00
Steven Moreland
6b6381cb58 nfc: update default implementation to match style.
Test: make android.hardware.nfc@1.0-impl
Change-Id: Ib76d663fcf28816bd2ba57f5fbd5ae0033b620f5
2016-10-03 08:54:46 -07:00
Dan Willemsen
242b34edd5 Convert to Android.bp
See build/soong/README.md for more information.

Bug: 31742855
Test: mma -j
Change-Id: Icb93f3b1b2caeb5e9c00f88ca35841b927ad075d
2016-09-30 10:31:54 -07:00
Iliyan Malchev
3db0f605e4 Default binderized implementation of android.hardware.nfc@1.0
Provide a default binderized HAL implementation.  The implementation
uses android.hardware.nfc@1.0-impl.so, which in turn loads the
conventional HAL (nfc_nci.default.so).  If a device includes package
android.hardware.nfc@1.0-service, the device will automatically use the
binderized implementation of the NFC HAL.  If a device includes package
android.hardware.nfc@1.0-impl instead, it will use the default
implementation in hardware/interfaces/nfc/1.0/default.

b/31688271
Test: pass

Change-Id: I31cd93d28705d287975b485092cffd7661599d7c
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-09-28 20:46:27 +00:00
Iliyan Malchev
678fa1f456 android.hardware.nfc@1.0: provide a default implementation
b/31524912
Test: pass

Change-Id: Id9d34f62f4a2b92bdc3beb3e62c89c82743c0ca0
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-09-22 23:31:52 +00:00