summaryrefslogtreecommitdiffstats
path: root/src/com/android/nfc/NfcService.java
Commit message (Expand)AuthorAgeFilesLines
* Allow different default MIU / window sizes.Martijn Coenen2012-08-071-1/+3
* Allow NfcB connects in NCI stack.Martijn Coenen2012-08-071-4/+0
* NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)Martijn Coenen2012-08-011-17/+7
* Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)Martijn Coenen2012-08-011-2/+2
* Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NO...Martijn Coenen2012-08-011-2/+2
* Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)Martijn Coenen2012-08-011-2/+2
* Add watchdog to applyRouting().Martijn Coenen2012-05-311-46/+53
* Close NFCEE when NFC is being shut down.Martijn Coenen2012-05-171-1/+9
* Added shared prefs for SE wired modeSunil Jogi2012-04-201-1/+1
* Updated disable methodSunil Jogi2012-04-201-2/+5
* First cut at Bluetooth BeamNick Pelly2012-04-041-2/+4
* Support for querying extended length APDU support.Martijn Coenen2012-04-021-0/+5
* 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 "Get rid of getLastError()."Martijn Coenen2012-03-291-5/+0
|\|
| * Get rid of getLastError().Martijn Coenen2012-03-291-5/+0
* | 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
| |/
* / Keep static NDEF in application rather than NFC Service.Nick Pelly2012-03-281-2/+2
|/
* 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
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 08:29:15 +0000