summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Expand)AuthorAgeFilesLines
* Bluetooth Beam bug fixes, UX and i18n.Martijn Coenen2012-05-105-113/+293
* Call right Bluetooth enable API.Martijn Coenen2012-04-261-1/+1
* Merge "Latest changes for Bluetooth Beam."Martijn Coenen2012-04-243-39/+388
|\
| * Latest changes for Bluetooth Beam.Martijn Coenen2012-04-203-39/+388
* | Added shared prefs for SE wired modeSunil Jogi2012-04-203-13/+66
* | Updated disable methodSunil Jogi2012-04-201-2/+5
|/
* Support for the new Uri[] Beam push API.Martijn Coenen2012-04-123-36/+57
* Force bluetooth OPP to handle ACTION_SEND.Martijn Coenen2012-04-051-1/+2
* Add support for making Mifare Classic readonly.Martijn Coenen2012-04-052-3/+11
* First cut at Bluetooth BeamNick Pelly2012-04-045-11/+208
* Merge "Support for querying extended length APDU support."Martijn Coenen2012-04-043-0/+12
|\
| * Support for querying extended length APDU support.Martijn Coenen2012-04-023-0/+12
* | Allow applications to disable default Beam behavior.Martijn Coenen2012-04-041-13/+43
|/
* Merge "Let connect() fail with an I/O exception if tag has left the field."Martijn Coenen2012-03-301-0/+4
|\
| * Let connect() fail with an I/O exception if tag has left the field.Martijn Coenen2012-03-291-0/+4
* | Merge "Remove permissions check from the TagService."Martijn Coenen2012-03-301-24/+2
|\ \ | |/
| * Remove permissions check from the TagService.Martijn Coenen2012-03-291-24/+2
* | Merge "Fix NPE when there's NDEF data we can't dispatch."Martijn Coenen2012-03-291-1/+2
|\ \
| * | Fix NPE when there's NDEF data we can't dispatch.Martijn Coenen2012-03-081-1/+2
* | | Merge "Get rid of getLastError()."Martijn Coenen2012-03-293-9/+2
|\ \ \ | | |/ | |/|
| * | Get rid of getLastError().Martijn Coenen2012-03-293-9/+2
* | | Merge "Don't crash on passing invalid data to NfcService."Martijn Coenen2012-03-291-0/+2
|\ \ \
| * | | Don't crash on passing invalid data to NfcService.Martijn Coenen2012-03-281-0/+2
* | | | Merge "Keep static NDEF in application rather than NFC Service."Nick Pelly2012-03-292-15/+9
|\ \ \ \
| * | | | Keep static NDEF in application rather than NFC Service.Nick Pelly2012-03-282-15/+9
| | |/ / | |/| |
* | | | Merge "Dejank Android Beam animation."Martijn Coenen2012-03-284-486/+582
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Dejank Android Beam animation.Martijn Coenen2012-03-284-486/+582
* | | Update URL from Market to Play. Add feature parameter.Nick Pelly2012-03-211-2/+2
|/ /
* | Merge "Perform default Beam behavior from system apps."Nick Pelly2012-03-061-11/+4
|\ \
| * | Perform default Beam behavior from system apps.Nick Pelly2012-03-061-11/+4
* | | Merge "Change threading/locking model of BluetoothHeadsetHandover"Nick Pelly2012-03-061-40/+40
|\ \ \ | |/ /
| * | Change threading/locking model of BluetoothHeadsetHandoverNick Pelly2012-03-021-40/+40
* | | Merge "Implement NFC-BT handover for Bluetooth headsets, such as Nokia BH-505."Nick Pelly2012-03-023-0/+576
|\ \ \ | |/ /
| * | Implement NFC-BT handover for Bluetooth headsets, such as Nokia BH-505.Nick Pelly2012-03-023-0/+576
| |/
* | Support for setting p2p modes from javaland and some cleanup.Martijn Coenen2012-03-023-0/+28
|/
* Fix crash when disabling NFC with target in field.Martijn Coenen2012-02-271-2/+8
* Cache installed packages for sending SE broadcasts.Martijn Coenen2012-02-131-21/+41
* Use the new "appliance" ui mode configuration to determine whether to show nf...Joe Onorato2012-02-111-1/+10
* Allow apps to selectively disable beamIsaac Levy2012-02-091-8/+9
* Merge "LLCP 1.1 support."Martijn Coenen2012-01-274-11/+14
|\
| * LLCP 1.1 support.Martijn Coenen2012-01-274-11/+14
* | Don't need to pass the NdefMessage in dispatch().Nick Pelly2012-01-262-8/+14
* | Merge "LLCP echo server implementation."Martijn Coenen2012-01-262-0/+431
|\ \ | |/
| * LLCP echo server implementation.Martijn Coenen2012-01-202-0/+431
* | Rewrite NDEF dispatch path. It was getting pretty messy.Nick Pelly2012-01-254-289/+306
* | Merge "Bring LLCP connectionless sockets back to life."Martijn Coenen2012-01-185-2/+119
|\ \ | |/
| * Bring LLCP connectionless sockets back to life.Martijn Coenen2012-01-135-2/+119
* | Make airplane override for NFC persistent.Martijn Coenen2012-01-101-4/+14
|/
* NfcService: some trivial cleanups.mike wakerly2011-12-129-25/+16
* resolved conflicts for merge of 92250f5c to masterNick Pelly2011-12-011-14/+25
|\