summaryrefslogtreecommitdiffstats
path: root/src/com/android/nfc/NfcService.java
Commit message (Expand)AuthorAgeFilesLines
* Support for setting p2p modes from javaland and some cleanup.Martijn Coenen2012-03-021-0/+12
* 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
* Merge "LLCP 1.1 support."Martijn Coenen2012-01-271-2/+2
|\
| * LLCP 1.1 support.Martijn Coenen2012-01-271-2/+2
* | Don't need to pass the NdefMessage in dispatch().Nick Pelly2012-01-261-7/+7
* | Rewrite NDEF dispatch path. It was getting pretty messy.Nick Pelly2012-01-251-8/+14
* | Merge "Bring LLCP connectionless sockets back to life."Martijn Coenen2012-01-181-0/+7
|\ \ | |/
| * Bring LLCP connectionless sockets back to life.Martijn Coenen2012-01-131-0/+7
* | Make airplane override for NFC persistent.Martijn Coenen2012-01-101-4/+14
|/
* NfcService: some trivial cleanups.mike wakerly2011-12-121-9/+7
* resolved conflicts for merge of 92250f5c to masterNick Pelly2011-12-011-14/+25
|\
| * Fix mismatched link()/unlink() causing NFC-EE to be stuck open.Nick Pelly2011-12-011-14/+25
* | Fix two incorrect synchronized statements.mike wakerly2011-11-281-2/+2
* | am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.ap...Nick Pelly2011-11-211-1/+0
|\ \ | |/
| * Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1Nick Pelly2011-11-211-1/+0
| |\
| | * Replace vendor specific NfcGoogle.apk with generic Nfc.apkNick Pelly2011-11-211-1/+0
* | | am 806a7827: Merge "Also send NFCEE broadcasts to dynamically registered rece...Martijn Coenen2011-11-171-9/+6
|\ \ \ | |/ /
| * | Also send NFCEE broadcasts to dynamically registered receivers.Martijn Coenen2011-11-171-9/+6
| |/
* | am 2b093e93: Merge "Enable NFC-EE immediately when screen is on but locked." ...Nick Pelly2011-11-151-92/+143
|\ \ | |/
| * Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1Nick Pelly2011-11-151-92/+143
| |\
| | * Enable NFC-EE immediately when screen is on but locked.mike wakerly2011-11-151-92/+143
* | | am f4226b69: Merge "Add null check to aovid NPE on un-matched close()." into ...Nick Pelly2011-11-151-3/+7
|\ \ \ | |/ /
| * | Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1Nick Pelly2011-11-141-3/+7
| |\ \ | | |/
| | * Add null check to aovid NPE on un-matched close().Nick Pelly2011-11-141-3/+7
* | | resolved conflicts for merge of ebf4b36e to masterNick Pelly2011-11-111-27/+58
|\ \ \ | |/ /
| * | Merge "Implement static white-list access control for NFC-EE." into ics-mr1Nick Pelly2011-11-111-27/+58
| |\ \ | | |/
| | * Implement static white-list access control for NFC-EE.Jeff Hamilton2011-11-111-27/+58
* | | am d9203771: Optimize soundpool use.Martijn Coenen2011-11-111-13/+51
|\ \ \ | |/ /
| * | Optimize soundpool use.Martijn Coenen2011-11-111-13/+51
| |/
| * Add event logs for NFC events. DO NOT MERGEJeff Hamilton2011-10-281-6/+6
* | Changes semantics of isNdefPushEnabled() - require NFC to be enabled.Nick Pelly2011-10-311-1/+1
* | Add event logs for NFC events.Jeff Hamilton2011-10-251-6/+6
|/
* NFC: Enable guard host timeout.Martijn Coenen2011-10-211-0/+1
* Fix crash when turning screen off and NFC is off.Martijn Coenen2011-10-191-6/+4
* Make the crash on screen off less frequent.Jeff Hamilton2011-10-171-16/+35
* Add DUMP permissions checkKenny Root2011-09-301-0/+9
* NfcService: call enableAppSwitches for additional events.mike wakerly2011-09-281-0/+1
* Fix NFC to only be enabled when the lockscreen is dismissed.Jeff Hamilton2011-09-261-1/+1
* Manually port d77e05f7 from gingerbread:Jeff Hamilton2011-09-141-0/+5
* Include stopped apps when broadcasting SE events.Jeff Hamilton2011-09-061-6/+11
* Merge "NFC service updates for moving NDEF push to a fragment."Nick Pelly2011-08-261-53/+27
|\
| * NFC service updates for moving NDEF push to a fragment.Nick Pelly2011-08-251-53/+27
* | Support for getMaxTransceiveLength() API.Martijn Coenen2011-08-261-5/+27
|/
* Decouple P2P link management from P2P UX management.Nick Pelly2011-08-101-89/+20
* Address code review comments for "Increase priority of EnableDisableTask..."Nick Pelly2011-08-101-0/+3
* Increase priority of EnableDisableTask thread to fix FW download failures.Nick Pelly2011-08-091-0/+10
* Fix bug where NfcAdapterExtras.get() always fails.Nick Pelly2011-08-091-2/+7
* A bunch of NfcService improvements.Nick Pelly2011-08-091-478/+581
* Turn on polling if NFC service restarts with screen on.Nick Pelly2011-08-061-1/+1