| Commit message (Expand) | Author | Age | Files | Lines |
* | Remove the binder interface for LLCP. | Jeff Hamilton | 2011-08-01 | 11 | -912/+288 |
* | Turn off ME Profile sharing & BT Dropbox. | Nick Pelly | 2011-08-01 | 4 | -663/+13 |
* | Minor cleanup: change private members to package. | Nick Pelly | 2011-08-01 | 2 | -22/+22 |
* | Fix bug: use foreground dispatch when ndef push is enabled via callback. | Nick Pelly | 2011-08-01 | 2 | -3/+3 |
* | Merge "Fix crash when screenshot fails." | Jeff Hamilton | 2011-07-29 | 1 | -6/+7 |
|\ |
|
| * | Fix crash when screenshot fails. | Jeff Hamilton | 2011-07-29 | 1 | -6/+7 |
* | | Pop up notification on first succesful Tap to Share. | Martijn Coenen | 2011-07-28 | 1 | -0/+32 |
|/ |
|
* | Merge "Play an animation for outbound NFC P2P." | Jeff Hamilton | 2011-07-27 | 4 | -37/+364 |
|\ |
|
| * | Play an animation for outbound NFC P2P. | Jeff Hamilton | 2011-07-26 | 4 | -37/+364 |
* | | resolved conflicts for merge of 5057a591 to master | Nick Pelly | 2011-07-26 | 2 | -100/+113 |
|\ \
| |/
|/| |
|
| * | am 2c3f9be8: Patch to manage TARGET_LOST status in case of Multiple protocol tag | Daniel Tomas | 2011-07-25 | 2 | -43/+64 |
| |\ |
|
| | * | Patch to manage TARGET_LOST status in case of Multiple protocol tag | Daniel Tomas | 2011-07-25 | 2 | -43/+64 |
* | | | Do foreground 0-click before preparing Bluetooth for dropbox. | Nick Pelly | 2011-07-21 | 1 | -1/+4 |
* | | | Fix synchronisation for 0-click setting. | Martijn Coenen | 2011-07-21 | 1 | -10/+13 |
* | | | Support for enabling/disabling zero-click sharing. | Martijn Coenen | 2011-07-21 | 1 | -6/+58 |
* | | | Merge "Support for getTimeout() (NFC service)." | Martijn Coenen | 2011-07-21 | 3 | -0/+14 |
|\ \ \ |
|
| * | | | Support for getTimeout() (NFC service). | Martijn Coenen | 2011-07-20 | 3 | -0/+14 |
* | | | | Remove the My Tag handling. | Jeff Hamilton | 2011-07-20 | 1 | -121/+0 |
* | | | | Bluetooth dropbox for out-of-band transfers | Ben Dodson | 2011-07-20 | 4 | -25/+610 |
|/ / / |
|
* | | | am 9e6b5d1f: am b3d770c4: Merge "- Properly initialize NfcService.mEeRoutingS... | Nick Pelly | 2011-07-15 | 1 | -0/+1 |
|\ \ \
| |/ / |
|
| * | | am b3d770c4: Merge "- Properly initialize NfcService.mEeRoutingState to ROUTE... | Nick Pelly | 2011-07-15 | 1 | -0/+1 |
| |\ \
| | |/ |
|
| | * | - Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allows | Robert Tsai | 2011-07-12 | 1 | -0/+1 |
* | | | Launch ACTION_MAIN intents that don't support CATEGORY_DEFAULT. | Ben Dodson | 2011-07-12 | 1 | -5/+20 |
* | | | Merge "Allow dispatch to a specific package" | Nick Pelly | 2011-07-12 | 1 | -3/+50 |
|\ \ \ |
|
| * | | | Allow dispatch to a specific package | Ben Dodson | 2011-07-11 | 1 | -3/+50 |
* | | | | Fix issue: NFC polling does not start on screen on with unlocked keyguard | Nick Pelly | 2011-07-08 | 1 | -6/+5 |
|/ / / |
|
* | | | Merge "Add the NDEF tech for tags coming in over P2P." | Jeff Hamilton | 2011-06-30 | 1 | -2/+8 |
|\ \ \ |
|
| * | | | Add the NDEF tech for tags coming in over P2P. | Jeff Hamilton | 2011-06-30 | 1 | -2/+8 |
* | | | | resolved conflicts for merge of 23cb1387 to master | Nick Pelly | 2011-06-30 | 1 | -10/+14 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | am e7a398f2: Do not change NFC on/off preference while executing SE reset. | Nick Pelly | 2011-06-29 | 1 | -10/+14 |
| |\ \
| | |/ |
|
| | * | Do not change NFC on/off preference while executing SE reset. | Nick Pelly | 2011-06-29 | 1 | -10/+14 |
* | | | Properly merge b5165e13 to master. | Nick Pelly | 2011-06-28 | 3 | -3/+24 |
* | | | resolved conflicts for merge of b5165e13 to master | Nick Pelly | 2011-06-28 | 2 | -1/+66 |
|\ \ \
| |/ / |
|
| * | | am 2c37e6a8: Patch to support New PN544 firmware events in the NfcService | Daniel Tomas | 2011-06-28 | 2 | -1/+66 |
| |\ \
| | |/ |
|
| | * | Patch to support New PN544 firmware events in the NfcService | Daniel Tomas | 2011-06-27 | 2 | -1/+66 |
* | | | Remove unnecessary param from profile vcard URI. | Dave Santoro | 2011-06-24 | 1 | -1/+0 |
* | | | Properly merge SE reset timeout fix. | Nick Pelly | 2011-06-22 | 1 | -2/+2 |
* | | | resolved conflicts for merge of d15714ce to master | Nick Pelly | 2011-06-22 | 1 | -0/+5 |
|\ \ \
| |/ / |
|
| * | | am 5a8844da: NfcService updates for NfcAdapterExtras API change. | Nick Pelly | 2011-06-20 | 1 | -10/+1 |
| |\ \
| | |/ |
|
| | * | NfcService updates for NfcAdapterExtras API change. | Nick Pelly | 2011-06-20 | 1 | -10/+1 |
* | | | Hack to fix broken build | Ben Dodson | 2011-06-22 | 1 | -2/+2 |
* | | | am 10577281: am 85a8366a: Set the transceive timeout to 10s when executeSeRes... | Daniel Tomas | 2011-06-22 | 1 | -0/+4 |
|\ \ \
| |/ / |
|
| * | | am 85a8366a: Set the transceive timeout to 10s when executeSeReset() is called | Daniel Tomas | 2011-06-20 | 1 | -0/+4 |
| |\ \
| | |/ |
|
| | * | Set the transceive timeout to 10s when executeSeReset() is called | Daniel Tomas | 2011-06-20 | 1 | -0/+4 |
* | | | Exchange me profile over NFC using android SNEP service. | Martijn Coenen | 2011-06-22 | 3 | -51/+148 |
* | | | Merge "Close SNEP socket on IOException." | Ben Dodson | 2011-06-20 | 1 | -1/+8 |
|\ \ \ |
|
| * | | | Close SNEP socket on IOException. | Martijn Coenen | 2011-06-20 | 1 | -1/+8 |
* | | | | Merge commit '52eadbdd' into nfc | Jason parks | 2011-06-20 | 1 | -2/+10 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | am 84e1e0ad: Reset the SE when a package that accessed it is uninstalled. | Jason parks | 2011-06-17 | 1 | -3/+10 |
| |\ \
| | |/ |
|
| | * | Reset the SE when a package that accessed it is uninstalled. | Jason parks | 2011-06-17 | 1 | -3/+10 |