summaryrefslogtreecommitdiffstats
path: root/nci
Commit message (Collapse)AuthorAgeFilesLines
* Nfc: read extra properties of Mifare ClassicHamster Tian2016-07-151-0/+11
| | | | | | * Fixes NFC TagInfo crash with MFC and native NFC stack. Change-Id: Ib5042f6969d34070fbf0b54b26596b86eda1cd26
* nfc: Make unknown protocol logs usefulPat Erley2016-02-101-2/+2
| | | | | | | Add the actual protocol number of the unknown protocol to the log message. Change-Id: Ib8cd61215fd37d765f21f2792782590890788a38
* Use global all-cpp-files-underDan Willemsen2015-10-131-12/+1
| | | | | | | The build system now has a better implementation of all-cpp-files-under Bug: 24204119 Change-Id: I9e1bf90559a894897ae829cb4f713cc5796584bc
* Support Mifare Classic tag.Jizhou Liao2015-08-2828-44/+15050
| | | | | | | Support NXP Mifare Classic tag. Bug: 23618022 Change-Id: If674b493bba7596803738f8c3d22b7ce89a0fa8b
* Fix peer-to-peer server register error if RF discovery is started.Jizhou Liao2015-08-242-0/+29
| | | | | | | | If RF discovery is started, discovery should be temporarily stopped before deregister peer-to-peer server. Bug: 22283840 Change-Id: I42c826454f050e09b3d673b89560a8c7bed728d7
* Support Mifare DESFire tag formatJizhou Liao2015-08-203-5/+94
| | | | | | Support Mifare DESFire tag format Change-Id: I362dc5c539ea7e5c749ca677f88d859d489a74d8
* Fix conflict vendor proprietary definitions.Jizhou Liao2015-08-032-240/+215
| | | | | | | Use protocol definition from .conf file in libnfc-nci instead of fixed value. Change-Id: Ib8a74304974de3396a2f9cc644bce3dc07421f21
* Reset P2P flag in de-initialization.Jizhou Liao2015-07-231-0/+1
| | | | | | The sP2PEnalbed flag should be set to false in de-initialization. Change-Id: I480d3664d004c068e8043e999da6da442a4095a0
* Expose peer LLCP version to apps.Martijn Coenen2015-04-152-0/+9
| | | | Change-Id: Id5ea699a8508b5bdf44c0bae2d38893e2c42241a
* am 9d734bdf: Merge "Add missing includes."Elliott Hughes2015-01-295-1/+10
|\ | | | | | | | | * commit '9d734bdf2c98e4408d1bf4645a805c24da9c604d': Add missing includes.
| * Add missing includes.Elliott Hughes2015-01-285-1/+10
| | | | | | | | Change-Id: I1dc1227e9800a46fdf44bd8f18a76c20adad5e5e
* | am 2d1187fa: Merge "Remove hardcoded ICU include paths."Narayan Kamath2015-01-051-1/+0
|\| | | | | | | | | * commit '2d1187fa6e9a060a39d845322fdec9a711c42faa': Remove hardcoded ICU include paths.
| * Remove hardcoded ICU include paths.Narayan Kamath2015-01-051-1/+0
| | | | | | | | | | | | | | ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS. bug: 18581021 Change-Id: Idef12878b62b69c6c2e2efcceb5db9e8c37c976c
* | am f30e2ed4: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-161-1/+0
|\| | | | | | | | | * commit 'f30e2ed4a9aa9801504c786c8ae515b88bf1d79e': Cleanup Obsolete LOCAL_PRELINK_MODULE.
| * Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-161-1/+0
| | | | | | | | | | Bug: 18675947 Change-Id: Ie791a926458c88d707c4fb3033825bfd570e9542
* | am 91cf8245: am e6b10cf6: Fix issue where Beam is disabled in SWAndres Morales2014-12-041-1/+1
|\ \ | | | | | | | | | | | | * commit '91cf82451434dd12713e23dfdaf49bc67dec114f': Fix issue where Beam is disabled in SW
| * | Fix issue where Beam is disabled in SWAndres Morales2014-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the screen is locked we don't persist the proper state, causing NFC P2P to be disabled until SW completes, breaking EDU provisioning. Bug: 18534741 Change-Id: I96b8f70a7b3c58e0690c2f2fc69776e15ec41806
* | | am 10e647dd: am 8a80bc7b: Merge "Prevent Beam at the lockscreen and during ↵Andres Morales2014-11-252-7/+17
|\| | | |/ |/| | | | | | | | | provisioning" into lmp-mr1-dev * commit '10e647dd5d8c476537d14844775c8baa961b4f9f': Prevent Beam at the lockscreen and during provisioning
| * Prevent Beam at the lockscreen and during provisioningAndres Morales2014-11-192-7/+17
| | | | | | | | | | | | | | | | | | | | | | Since we can poll at the lockscreen not for unlock tags, need to explicitly disable Beam. Also since we allow peripheral handover during provisioning, we started allowing Beam as well. Blocking that. Bug: 18349433 Change-Id: I987f43228d2c003c66201d2e91bd9bdfebd49d78
* | Move packages/apps/Nfc to libc++.Dan Albert2014-11-151-1/+0
| | | | | | | | | | Bug: 15193147 Change-Id: I1af5d83884a439ddfa7393dd2da8440f250ed65b
* | am 269280d2: am f863f79a: Merge "Shutdown EEs when NFC is disabled." into ↵Martijn Coenen2014-09-243-0/+49
|\| | | | | | | | | | | | | lmp-dev * commit '269280d26f6a21f08c6dec7fd9a82eaa48d11d14': Shutdown EEs when NFC is disabled.
| * Shutdown EEs when NFC is disabled.Martijn Coenen2014-09-223-0/+49
| | | | | | | | | | Bug: 17298769 Change-Id: Icee92fb3fafb3168a4e04582b328b4ad4b6e3e39
* | am 894c9fe3: am b5370c06: Merge "Don\'t report tag as NdefFormatable if ↵Martijn Coenen2014-09-161-0/+1
|\| | | | | | | | | | | | | already NDEF." into lmp-dev * commit '894c9fe393dbd26bd48d70fcee9478c94b5c5bd8': Don't report tag as NdefFormatable if already NDEF.
| * Don't report tag as NdefFormatable if already NDEF.Martijn Coenen2014-09-161-0/+1
| | | | | | | | | | | | | | | | This was always the behavior on NXP implementations, and is correct according to our public API documentation. Bug: 16517161 Change-Id: If6c9fb4f402b69c97993f6f0c88bfed6ce3078dd
* | am 34e6f0f2: am b3ac715d: Merge "Support for AID prefix registration." into ↵Martijn Coenen2014-09-162-1/+25
|\| | | | | | | | | | | | | lmp-dev * commit '34e6f0f2b67f85124e32b1bd22a5f39c9729d13b': Support for AID prefix registration.
| * Merge "Support for AID prefix registration." into lmp-devMartijn Coenen2014-09-162-1/+25
| |\
| | * Support for AID prefix registration.Martijn Coenen2014-09-152-1/+25
| | | | | | | | | | | | | | | Bug: 16517161 Change-Id: I8bc58ac0e9fb6684a7ee22d712dbbd91279d4c30
* | | am 512698ea: Merge "Remove makefile cruft."Dan Albert2014-09-121-4/+3
|\ \ \ | |/ / |/| | | | | | | | * commit '512698ea7ac406f7e8a0895e80f74a61bfa13f3b': Remove makefile cruft.
| * | Remove makefile cruft.Dan Albert2014-09-121-4/+3
| | | | | | | | | | | | | | | | | | Don't manually include stlport, and don't use private bionic headers. Change-Id: I76937432378bd4b280185e0ea1a76910cb3632f3
* | | Merge "RoutingManager class shall properly handle RF-deactivate event." into ↵Martijn Coenen2014-09-121-0/+9
|\ \ \ | | | | | | | | | | | | lmp-dev
| * | | RoutingManager class shall properly handle RF-deactivate event.Evan Chu2014-09-101-0/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The handler must update the gActivated variable to false. The PowerSwitch class depends on this variable. If the variable is wrong PowerSwitch class will block forever. Bug: 16517161 Change-Id: I1015b05f72a36c49646a902daf49d3de7cac5e34
* / | Reinstate RF field events.Martijn Coenen2014-09-082-0/+31
|/ / | | | | | | | | | | | | | | | | These are generic enough to maintain in AOSP, and can still be protected by nfcee_access.xml like they used to be. Bug: 16653617 Change-Id: Id604fcc45d4263b24fea2f16ca6a24e25f8580c3
* | Merge "Restrict UICC listen to Type-A only." into lmp-devMartijn Coenen2014-08-151-20/+19
|\ \
| * | Restrict UICC listen to Type-A only.Martijn Coenen2014-08-141-20/+19
| | | | | | | | | | | | | | | Bug: 16517161 Change-Id: I0524ce42a09cec19196028318f23db21725672e7
* | | Merge "Prevent deadlock during NDEF-detection." into lmp-devMartijn Coenen2014-08-151-6/+0
|\ \ \
| * | | Prevent deadlock during NDEF-detection.Evan Chu2014-08-141-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NFC service can call JNI to perform NDEF-detection immediately after the presence-check operation is trying to RF-deactivate the tag. This race condition can cause a deadlock because the sCheckNdefSem semaphore is not unlocked. Bug: 16984334 Change-Id: Id52428de156e08a5755a13553cf5e9b08aa07bb9
* | | | Merge "Use SE tech parameters when available." into lmp-devMartijn Coenen2014-08-142-22/+36
|\ \ \ \ | | |/ / | |/| |
| * | | Use SE tech parameters when available.Martijn Coenen2014-08-132-22/+36
| |/ / | | | | | | | | | | | | Bug: 16517161 Change-Id: I20428352cf57e815b0dd39e0235745568aa613fb
* / / Fix deadlock.Martijn Coenen2014-08-111-19/+21
|/ / | | | | | | | | Bug: 16958324 Change-Id: I0cc7b4b9d400727cc6e59ad7d5440dfb2842edbe
* | Support for configuring SE listen technologies.Martijn Coenen2014-07-254-4/+76
| | | | | | | | | | | | | | | | | | | | | | If the config file specified an SE to use, configure its listen technologies correctly. Also, fix commitRouting() to actually commit the configuration. Bug: 16517161 Change-Id: I1283fcb3f855c89a8b238be857bd56f06a14138f
* | am a4464d73: am f62a9a00: Merge "Switch Nfc to the new icu."Elliott Hughes2014-07-101-2/+2
|\| | | | | | | | | * commit 'a4464d73d35e33b503e8032a5834318974a79243': Switch Nfc to the new icu.
| * Switch Nfc to the new icu.Elliott Hughes2014-07-091-2/+2
| | | | | | | | Change-Id: Ifb733ecb6065857ea5d5346e799638e1e03c1729
* | Fix NfcService JNI issueAndres Morales2014-07-072-4/+4
| | | | | | | | | | | | | | Native fn takes param but not needed or declared by JNI startup code. Solution: remove param Change-Id: I11b6196ba75826a15d038dd59f56d7c15dfff4ae
* | Merge "Obtain default and off-host destination routes from JNI."Martijn Coenen2014-07-013-8/+50
|\ \
| * | Obtain default and off-host destination routes from JNI.Evan Chu2014-07-013-8/+50
| | | | | | | | | | | | | | | | | | | | | The NFC service obtains default and off-host destination routes from JNI, which in turn obtains them from the device configuration file. Change-Id: I29f16d982e5675b12a86acb8b7cb99e234fbe222
* | | Don't conditionally enable snooze.Martijn Coenen2014-06-272-11/+5
|/ / | | | | | | | | | | We keep our devices in snooze by default now. Change-Id: Ia84635031d60221da054448b8c81c5c48f1f821d
* | Refactoring NfcService routing logic.Andres Morales2014-06-254-282/+156
| | | | | | | | | | | | | | | | | | | | | | Currently, routing logic contains a lot of nested conditionals and causes unnecessary work to occur, particularly in enabling reader mode. This CL moves this logic to a state object that contains all necessary information to transfer from one routing state to another, leading to fewer calls to the NFCC, eliminating duplicate work, and making the code more readable. Change-Id: I6a8758e61cc0cbb015d618575da35386eadf7d3a
* | Fix duplicate tag dispatch after NFC triggered unlockAndres Morales2014-06-201-4/+16
| | | | | | | | | | | | | | | | | | | | | | Since we allowed the tag to continue dispatch after unlock as well as reenable discovery when the phone is unlocked the tag used for unlock gets processed twice. This patch adds logic to ensure the tag gets processed only once. Change-Id: Ie42bffb5ec302b68013e6bf1c1104db01e96e79f
* | Reassemble inbound card emulation data.Evan Chu2014-06-163-27/+52
| | | | | | | | Change-Id: I7c27d000480f876c3f0f0e87a0533e9b0d7804a2
* | When adjusting routing table, wait for completion event.Evan Chu2014-06-092-6/+31
| | | | | | | | | | | | | | When JNI calls NFA_EeUpdateNow() to adjust the routing table, JNI shall wait for NFA_EE_UPDATED_EVT completion event. Change-Id: Iaccb3770e82f8b95d6fc9afc50d0f223d1e3f551
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 22:21:27 +0000