summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update NFC sounds.Nick Pelly2011-08-023-0/+0
* Allow NDEF swap.Nick Pelly2011-08-022-21/+6
* Turn off ME Profile sharing & BT Dropbox.Nick Pelly2011-08-015-665/+13
* Minor cleanup: change private members to package.Nick Pelly2011-08-012-22/+22
* Fix bug: use foreground dispatch when ndef push is enabled via callback.Nick Pelly2011-08-012-3/+3
* Merge "Fix crash when screenshot fails."Jeff Hamilton2011-07-291-6/+7
|\
| * Fix crash when screenshot fails.Jeff Hamilton2011-07-291-6/+7
* | Pop up notification on first succesful Tap to Share.Martijn Coenen2011-07-282-0/+38
|/
* Reconcile with gingerbread-mr4-releaseThe Android Open Source Project2011-07-270-0/+0
|\
| * Patch to manage TARGET_LOST status in case of Multiple protocol tagDaniel Tomas2011-07-253-72/+98
| * Prevent SE from being opened while target is in field.Daniel Tomas2011-07-254-3/+38
| * Do not write to EEPROM when turning screen on/off.Nick Pelly2011-07-251-1/+1
| * NfcService updates for NfcAdapterExtras API change.Nick Pelly2011-07-251-10/+1
| * Reset the SE when a package that accessed it is uninstalled.Jason parks2011-07-251-3/+10
| * Patch to enable the Card Emulation detection mechanismDaniel Tomas2011-07-251-1/+4
* | Merge "Play an animation for outbound NFC P2P."Jeff Hamilton2011-07-276-37/+393
|\ \
| * | Play an animation for outbound NFC P2P.Jeff Hamilton2011-07-266-37/+393
* | | Merge "resolved conflicts for merge of 5057a591 to master"Nick Pelly2011-07-263-129/+147
|\ \ \ | |/ / |/| |
| * | resolved conflicts for merge of 5057a591 to masterNick Pelly2011-07-263-129/+147
| |\ \
| | * \ am 2c3f9be8: Patch to manage TARGET_LOST status in case of Multiple protocol tagDaniel Tomas2011-07-253-72/+98
| | |\ \
| | | * | Patch to manage TARGET_LOST status in case of Multiple protocol tagDaniel Tomas2011-07-253-72/+98
* | | | | Merge "Improve DESFire check to determine NdefFormatable."Martijn Coenen2011-07-261-6/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improve DESFire check to determine NdefFormatable.Martijn Coenen2011-07-261-6/+19
* | | | | Merge 3d644e80Jean-Baptiste Queru2011-07-264-3/+38
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 04a29c85: Prevent SE from being opened while target is in field.Daniel Tomas2011-07-254-3/+38
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Prevent SE from being opened while target is in field.Daniel Tomas2011-07-254-3/+38
* | | | | am e1e26c9d: am 7aedb9c2: Patch to enable the Card Emulation detection mechanismDaniel Tomas2011-07-251-1/+4
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | am 7aedb9c2: Patch to enable the Card Emulation detection mechanismDaniel Tomas2011-07-251-1/+4
| |\ \ \ | | |/ /
| | * | Patch to enable the Card Emulation detection mechanismDaniel Tomas2011-07-191-1/+4
* | | | Adding content description for accessibility.Svetoslav Ganov2011-07-211-0/+4
* | | | Do foreground 0-click before preparing Bluetooth for dropbox.Nick Pelly2011-07-211-1/+4
* | | | Merge "Fix synchronisation for 0-click setting."Martijn Coenen2011-07-211-10/+13
|\ \ \ \
| * | | | Fix synchronisation for 0-click setting.Martijn Coenen2011-07-211-10/+13
* | | | | Reconcile with gingerbread-mr4-releaseThe Android Open Source Project2011-07-210-0/+0
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | - Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allowsRobert Tsai2011-07-181-0/+1
| * | | Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-303-11/+141
* | | | Support for enabling/disabling zero-click sharing.Martijn Coenen2011-07-211-6/+58
* | | | Merge "Support for getTimeout() (NFC service)."Martijn Coenen2011-07-214-11/+71
|\ \ \ \
| * | | | Support for getTimeout() (NFC service).Martijn Coenen2011-07-204-11/+71
* | | | | Remove the My Tag handling.Jeff Hamilton2011-07-201-121/+0
* | | | | Bluetooth dropbox for out-of-band transfersBen Dodson2011-07-209-25/+627
* | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-07-180-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | reset back to latest, and keep historyandroid-merger2011-07-130-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | temp reset to 39, and keep historyandroid-merger2011-07-120-0/+0
| | |\ \ \ | | |/ / / | |/| | |
* | | | | am 9e6b5d1f: am b3d770c4: Merge "- Properly initialize NfcService.mEeRoutingS...Nick Pelly2011-07-151-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am b3d770c4: Merge "- Properly initialize NfcService.mEeRoutingState to ROUTE...Nick Pelly2011-07-151-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "- Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This a...Nick Pelly2011-07-141-0/+1
| | |\ \ \
| | | * | | - Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allowsRobert Tsai2011-07-121-0/+1
* | | | | | resolved conflicts for merge of 399a21b8 to masterKenny Root2011-07-151-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c91dcc54: Do not write to EEPROM when turning screen on/off.Nick Pelly2011-07-151-1/+1
| |\ \ \ \ \ | | |/ / / /