summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Turn off ME Profile sharing & BT Dropbox.Nick Pelly2011-08-014-663/+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-281-0/+32
|/
* Merge "Play an animation for outbound NFC P2P."Jeff Hamilton2011-07-274-37/+364
|\
| * Play an animation for outbound NFC P2P.Jeff Hamilton2011-07-264-37/+364
* | resolved conflicts for merge of 5057a591 to masterNick Pelly2011-07-262-100/+113
|\ \ | |/ |/|
| * am 2c3f9be8: Patch to manage TARGET_LOST status in case of Multiple protocol tagDaniel Tomas2011-07-252-43/+64
| |\
| | * Patch to manage TARGET_LOST status in case of Multiple protocol tagDaniel Tomas2011-07-252-43/+64
* | | Do foreground 0-click before preparing Bluetooth for dropbox.Nick Pelly2011-07-211-1/+4
* | | Fix synchronisation for 0-click setting.Martijn Coenen2011-07-211-10/+13
* | | Support for enabling/disabling zero-click sharing.Martijn Coenen2011-07-211-6/+58
* | | Merge "Support for getTimeout() (NFC service)."Martijn Coenen2011-07-213-0/+14
|\ \ \
| * | | Support for getTimeout() (NFC service).Martijn Coenen2011-07-203-0/+14
* | | | Remove the My Tag handling.Jeff Hamilton2011-07-201-121/+0
* | | | Bluetooth dropbox for out-of-band transfersBen Dodson2011-07-204-25/+610
|/ / /
* | | 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
| |\ \ | | |/
| | * - Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allowsRobert Tsai2011-07-121-0/+1
* | | Launch ACTION_MAIN intents that don't support CATEGORY_DEFAULT.Ben Dodson2011-07-121-5/+20
* | | Merge "Allow dispatch to a specific package"Nick Pelly2011-07-121-3/+50
|\ \ \
| * | | Allow dispatch to a specific packageBen Dodson2011-07-111-3/+50
* | | | Fix issue: NFC polling does not start on screen on with unlocked keyguardNick Pelly2011-07-081-6/+5
|/ / /
* | | Merge "Add the NDEF tech for tags coming in over P2P."Jeff Hamilton2011-06-301-2/+8
|\ \ \
| * | | Add the NDEF tech for tags coming in over P2P.Jeff Hamilton2011-06-301-2/+8
* | | | resolved conflicts for merge of 23cb1387 to masterNick Pelly2011-06-301-10/+14
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am e7a398f2: Do not change NFC on/off preference while executing SE reset.Nick Pelly2011-06-291-10/+14
| |\ \ | | |/
| | * Do not change NFC on/off preference while executing SE reset.Nick Pelly2011-06-291-10/+14
* | | Properly merge b5165e13 to master.Nick Pelly2011-06-283-3/+24
* | | resolved conflicts for merge of b5165e13 to masterNick Pelly2011-06-282-1/+66
|\ \ \ | |/ /
| * | am 2c37e6a8: Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-282-1/+66
| |\ \ | | |/
| | * Patch to support New PN544 firmware events in the NfcServiceDaniel Tomas2011-06-272-1/+66
* | | Remove unnecessary param from profile vcard URI.Dave Santoro2011-06-241-1/+0
* | | Properly merge SE reset timeout fix.Nick Pelly2011-06-221-2/+2
* | | resolved conflicts for merge of d15714ce to masterNick Pelly2011-06-221-0/+5
|\ \ \ | |/ /
| * | am 5a8844da: NfcService updates for NfcAdapterExtras API change.Nick Pelly2011-06-201-10/+1
| |\ \ | | |/
| | * NfcService updates for NfcAdapterExtras API change.Nick Pelly2011-06-201-10/+1
* | | Hack to fix broken buildBen Dodson2011-06-221-2/+2
* | | am 10577281: am 85a8366a: Set the transceive timeout to 10s when executeSeRes...Daniel Tomas2011-06-221-0/+4
|\ \ \ | |/ /
| * | am 85a8366a: Set the transceive timeout to 10s when executeSeReset() is calledDaniel Tomas2011-06-201-0/+4
| |\ \ | | |/
| | * Set the transceive timeout to 10s when executeSeReset() is calledDaniel Tomas2011-06-201-0/+4
* | | Exchange me profile over NFC using android SNEP service.Martijn Coenen2011-06-223-51/+148
* | | Merge "Close SNEP socket on IOException."Ben Dodson2011-06-201-1/+8
|\ \ \
| * | | Close SNEP socket on IOException.Martijn Coenen2011-06-201-1/+8
* | | | Merge commit '52eadbdd' into nfcJason parks2011-06-201-2/+10
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 84e1e0ad: Reset the SE when a package that accessed it is uninstalled.Jason parks2011-06-171-3/+10
| |\ \ | | |/
| | * Reset the SE when a package that accessed it is uninstalled.Jason parks2011-06-171-3/+10
* | | Merge "Close sockets on failure"Ben Dodson2011-06-172-1/+9
|\ \ \