Commit Graph

15 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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