summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed packet size in MyTagClient.Sylvain Fonteneau2010-11-241-3/+3
| | | | | | The packet was always sized to MIU instead of actual buffer size. Change-Id: Iaf2fbd1cddf07a95e95a8dd69323d62dca8e6a2c
* Merge "Enabled sending of large messages in MyTagClient." into gingerbread-nfcSylvain Fonteneau2010-11-241-4/+17
|\
| * Enabled sending of large messages in MyTagClient.Sylvain Fonteneau2010-11-231-4/+17
| | | | | | | | | | | | | | If the message is to large to fit in a single packet (its size is defined by MIU), then it need to be splited in multiple packets. Change-Id: I69eafac0b250b0f32901795b2ab80bad173ae35a
* | Merge "Renamed MyTagServer tag to a more readable value." into gingerbread-nfcSylvain Fonteneau2010-11-241-1/+1
|\ \
| * | Renamed MyTagServer tag to a more readable value.Sylvain Fonteneau2010-11-231-1/+1
| |/ | | | | | | Change-Id: Ic5c321c3dbf3ca1f7f4e0697791522dd53dccf3e
* | Fix to restart the polling loop when a connect failed in P2Pdaniel_Tomas2010-11-241-1/+1
| | | | | | | | Change-Id: Icaeb2ed76d87da64c88b496ba76295aadeb12a7e
* | Removed dead code.Sylvain Fonteneau2010-11-221-2/+0
|/ | | | Change-Id: Ia543f55135701154d2c639639b2183bfa07c9fd9
* Secure Element Access implementationDaniel Tomas2010-11-192-0/+249
| | | | Change-Id: Ia1c006c52aaf312408ef2fba96715b1b6c382ea9
* Fix a few things.Jeff Hamilton2010-11-193-12/+11
| | | | | | | One file got left out of my last commit, and fix some logging around My Tag. Change-Id: Iafb47dd5a3f6ed8e337b1f951875d010fc328002
* Update to API changes.Jeff Hamilton2010-11-194-155/+79
| | | | Change-Id: I8f52bf20f493581aef80201b4b112af28cf3b5fa
* Make sure to close the communication socket.Jeff Hamilton2010-11-181-0/+6
| | | | Change-Id: Ie13294a978b46d5e75128b2d0fdd4c2f7a70f2e2
* Revert "Fix to disable P2P feature in the NFC Service and JNI"Jeff Hamilton2010-11-181-1/+1
| | | | This reverts commit ae66f8e306a46a24e4121b72b30d8beb5e1c08f9.
* Revert "Remove My Tag support."Jeff Hamilton2010-11-183-2/+406
| | | | | | This reverts commit 825f01522a1d68cadb634c88101e96f842478926. Change-Id: I75e027c066ba7bddaab87f910083707d8eb380b0
* Remove dead code.Jeff Hamilton2010-11-111-28/+0
| | | | | | | | NativeNfcTag contains the NDEF read/write and NativeNdefTag is not used anywhere. Change-Id: Ic3f7c3c792419468ea9c02f3d08df2761627137e
* Revert "Remove the My Tag feature."Jeff Hamilton2010-11-111-0/+10
| | | | This reverts commit 1fc06b8d4dfd7e92c43cbd4c5aacf8fa66d181d1.
* Quiet most logs in NFC by default.Jeff Hamilton2010-11-032-39/+41
| | | | | | Bug: 3124915 Change-Id: If5a3e6b21fe43d9ce2ff82ee65751baaa1c0e0a2 Signed-off-by: Nick Pelly <npelly@google.com>
* Don't turn on polling loop at NFC service init if screen is off.Nick Pelly2010-11-031-1/+1
| | | | | | | | NFC service can be restarted with screen off, and we will be put in polling loop, or worse constant RF, if this happens with a card in field. Change-Id: I0b8d2ba04f3af47908586cccf7210d9a7abb5d54 Signed-off-by: Nick Pelly <npelly@google.com>
* Fix to disable P2P feature in the NFC Service and JNIDaniel Tomas2010-11-031-1/+1
| | | | | Change-Id: Ie288273526d9e947545dde134ac1d23399a716c4 Signed-off-by: Nick Pelly <npelly@google.com>
* Add wakelock around the disable discovery path during SCREEN_OFF.Nick Pelly2010-11-031-0/+7
| | | | | | | | We're about to also disconnect from tags during SCREEN_OFF, which can take some time, so we need to make sure to hold the CPU on. Change-Id: Ie551c028cecfb49faddc95a45ecd8eac07671968 Signed-off-by: Nick Pelly <npelly@google.com>
* Remove the My Tag feature.Jeff Hamilton2010-11-031-10/+0
| | | | Change-Id: I4f839d20d2be8c816fffedc9f64292008751a7c1
* Implementation of poll bytes / activation bytes APIMartijn Coenen2010-11-032-3/+19
| | | | | Change-Id: I92776225eafd39e0c4dad15b46d5e0ce63f7a991 Signed-off-by: Nick Pelly <npelly@google.com>
* Remove My Tag support.Jeff Hamilton2010-11-033-404/+2
| | | | Change-Id: Ic8f962879dc8c226b0ac10d2a1d4e41ede5d9326
* Don't show the icon if nfc is disabled and someone sets a tag.Jason parks2010-11-031-1/+4
| | | | Change-Id: I613e5755dea46e6920ab98621d0f8ffb2feeb358
* Changed LLCP symmetry timeout back to 1.5s (LTO=150).Sylvain Fonteneau2010-11-031-1/+1
| | | | | | | The LTO was previously set to 250 as a workaround for performance issues. This is not needed any more with the current RF speed. Change-Id: Id236b142d3150203781d00434b93387d925abda5
* Hide/show the MyTag icon when NFC is enabled/disabled.Jason parks2010-11-031-44/+49
| | | | Change-Id: I3ca5e6f90d85fdef262874bd9223ca5f49468af4
* Don't unregister service sockets when they're created.Jeff Hamilton2010-11-031-10/+20
| | | | | | | This allows services to accept multiple times in a row. Change-Id: Ifef474cd753d0481f3a9befce91d2fec869d34ad
* Enable My Tag server.Jeff Hamilton2010-11-021-1/+1
| | | | Change-Id: I597e4be9051cc30c4432f90bd8399ae4bdd84b83
* Don't disconnect when the peer is the initiator.Jeff Hamilton2010-11-021-2/+7
| | | | Change-Id: Ie56036441ea41d9290d33915e3616e9379f6ea98
* Log a warning if the bytes to mytag is 0.Jason parks2010-11-021-1/+6
| | | | Change-Id: I5cddb343bf0cad13768fb4d6d3d00f82f4205afa
* Fixes for My Tag server.Jeff Hamilton2010-11-023-26/+35
| | | | | | | | | | | | | | | | - Record the socket parameters for registered LLCP service sockets since they're used when accept() is called before a connection is active. - Add a missing break when handling mock NDEF messages to avoid a crash when a My Tag is scanned. - Fix up the accept and read loops in My Tag server. Change-Id: Ia994c9dacb5e6770ac5c0f1b5b9e0156eea6e5cb
* Remove timeout support - it was guaranteed to cause deadlock.Nick Pelly2010-11-023-113/+6
| | | | | | | | | sem_timedwait() was unbalanced. Also remove more dead code, and reduce watchdog timeout from 10 to 5 seconds. Change-Id: Ica776e4a27905071c1453b2db02f9ffadf6f9461 Signed-off-by: Nick Pelly <npelly@google.com>
* Patch for semaphore managnement with wrong return code from the LibnfcDaniel Tomas2010-11-021-11/+0
| | | | Change-Id: I909b2623f66ca0f3f0370617e2df4b1075614c44
* Fix empty or incorrect ndef message not sending Intent.Martijn Coenen2010-11-021-4/+22
| | | | | | | Will now send an intent with an empty NDEF message array attached Change-Id: I58d86c9b5cfff127581824ca6af410a503059cbb Signed-off-by: Nick Pelly <npelly@google.com>
* CONCURRENCY_LOCK() cleanup.Nick Pelly2010-11-023-19/+7
| | | | | | | | | Rename functions that need to be called with lock held to _locked(). Remove dead code. Replace asyncDisconnect() with disconnect() - its broken. Change-Id: I04feb449394750954e202223366a0fa5ea425924 Signed-off-by: Nick Pelly <npelly@google.com>
* Persist mytag in the service.Jason parks2010-11-011-3/+135
| | | | Change-Id: Ibd553a01f8790d1f38673bd08f90e3c1a847f727
* Update NFC for modified API's.Nick Pelly2010-10-281-1/+4
| | | | | Change-Id: Ibd50e30c7f340eed7c84785d2060a8a237f9cd5b Signed-off-by: Nick Pelly <npelly@google.com>
* Add more logging of LLCP socket actions.Jeff Hamilton2010-10-283-7/+40
| | | | Change-Id: Ib6e8c642a97abab6592200023c1bb0993d0bfdc0
* Track the LLCP link state as it changes.Jeff Hamilton2010-10-281-0/+7
| | | Change-Id: I6d7756739489b240e2e27c91a1afd8c5bd534342
* Patch from NXP. Avoid overrun when setting timer.Jeff Hamilton2010-10-272-40/+23
| | | | Change-Id: I9f46908d99d05804cd325024fc60da762f5beb1d
* Force NFC service to abort() during emergency_recovery().Nick Pelly2010-10-271-15/+3
| | | | | | | | | | | | | | | emergency_recovery() was not able to kill libnfc threads blocked in mutex, and was just wedging everything. So instead kill the entire NFC service process. The framework will immediately restart it, and the NFC API's will rebind to the new service handle. Also I cleaned up the code to handle boot complete. This is necessary to clean up because during recovery restart we do not receive a boot complete event. It turns out we can use FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT on intent broadcasts, and avoid having to track boot complete at all. Change-Id: I41c885b441128fd447d6b8c63bb50a13a1d4cdfd Signed-off-by: Nick Pelly <npelly@google.com>
* Another attempt to mitigate loads-of-ANR-when-NFC-wedges.Nick Pelly2010-10-261-8/+8
| | | | | | | | Do not even take a mutex in SCREEN_ON/OFF receiver. Just schedule the thread. Bug: 3131975 Change-Id: Ic8763315c815aff63299f77590e61d668d13031b Signed-off-by: Nick Pelly <npelly@google.com>
* Move the My Tag client to its own thread.Jeff Hamilton2010-10-261-13/+23
| | | | Change-Id: Ie7340a34ecd1e0a81d9589f8c8e130b761a221b5
* More work on My Tag.Jeff Hamilton2010-10-263-207/+232
| | | | Change-Id: Iba652af8efdec58d04d5e8e5ecc6af8281f57279
* Fix bug preventing RawTagConnection and NdefTagConnection clases from working.Sylvain Fonteneau2010-10-261-0/+2
| | | | | | | Added missing native tag registration in NFC service. Change-Id: Id470fc93fc83a4b9bde6d0bd78500f50635efb48 Signed-off-by: Nick Pelly <npelly@google.com>
* Fix bug in async-screen-on-off.Nick Pelly2010-10-261-3/+3
| | | | | | | | Use a boxed boolean, not a primitive boolean. Use the correct array index. Change-Id: Id3cd16c8d21b9dacd6d167b0458b6583d7fba89f Signed-off-by: Nick Pelly <npelly@google.com>
* Do not call mWatchdog if it has not been assigned.Nick Pelly2010-10-261-7/+21
| | | | | | | | | mWatchdog is only assigned during a successful connect(), but other NativeTag methods were calling methods on it without a null check. Bug: 3133259 Change-Id: Ia28a6cad7bbf8e029e876f902474f6b4af380e02 Signed-off-by: Nick Pelly <npelly@google.com>
* Move NFC adapter configuration off the main thread during SCREEN_ON/OFF events.Nick Pelly2010-10-261-3/+22
| | | | | | | | | | | These should be safe on the main thread, because they involve configuration of the local NFC adapter, so it should be very quick. However the NFC stack is currently wedging frequently, and the resulting ANR's during screen on/screen off are very disruptive. Bug: 3131975 Change-Id: I06d3ee17a991a95676666300942054797c6adf00 Signed-off-by: Nick Pelly <npelly@google.com>
* Checkpoint work on My Tag.Jeff Hamilton2010-10-263-60/+341
| | | | | | | | The tag server has some problems when being stopped and the client never gets notified about the LLCP connection. Change-Id: Ifdfc60d48ed85a9916f8abb085afcf01dd5a0155
* Show an icon in the status bar when the NfcAdapter is in card emulation mode.Jeff Hamilton2010-10-251-8/+40
| | | | Change-Id: Ia54094291726fa4fac152a49b1b182d73ff9958f
* Turn NFC discovery off when screen is off.Nick Pelly2010-10-251-7/+37
| | | | | Change-Id: Ib122c9a952f7f41798f7e6b2b8e9884b53e67723 Signed-off-by: Nick Pelly <npelly@google.com>