summaryrefslogtreecommitdiffstats
path: root/src/com/android/nfc/NfcService.java
Commit message (Expand)AuthorAgeFilesLines
* Merge N-MR1 to remoteLalit Kansara2016-12-061-34/+77
|\
| * Don't dispatch tags when NDEF read times out.Martijn Coenen2016-08-311-9/+0
| * Fix Tron stats reporting.Martijn Coenen2016-08-121-13/+24
| * Allow for ignore() to work with random UID tags.Martijn Coenen2016-08-111-31/+43
| * Tron Metrics for Tag/P2P/HCE.Martijn Coenen2016-08-051-0/+29
* | NFC: Adding new vendor specific interface to NFC ServicePuneet Mishra2016-08-241-0/+10
|/
* Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-211-2/+3
* Verify setForegroundDispatch caller is in foreground.Martijn Coenen2016-05-231-1/+8
* Fix API review comments, add remove callback.Martijn Coenen2016-04-271-34/+81
* Only add service when object is complete initialized.Martijn Coenen2016-04-111-2/+4
* Don't disable NFC in airplane mode.Martijn Coenen2016-03-291-59/+1
* Fix references to obsolete Settings.SystemMartijn Coenen2016-02-261-4/+4
* resolve merge conflicts of ab0586a700 to master.Martijn Coenen2016-01-251-7/+84
|\
| * Implementation of HCE for NFC-F.Yoshinobu Ito2016-01-221-7/+84
* | Implement API for "debouncing" NFC tags.Martijn Coenen2016-01-181-25/+45
* | Follow PackageManager refactoring.Jeff Sharkey2016-01-061-1/+1
* | am 3f73df83: am 3f3788f0: am f08a81c4: Merge "Don\'t enable reader mode when ...Martijn Coenen2015-10-191-0/+4
|\|
| * Don't enable reader mode when NFC is disabled.Martijn Coenen2015-10-191-0/+4
* | cleanup USER_OWNER in NfcXiaohui Chen2015-10-131-1/+1
|/
* Expose peer LLCP version to apps.Martijn Coenen2015-04-151-2/+2
* Add missing @OverrideMathias Jeppsson2015-04-081-0/+1
* Remove B' polling for B tagsAndres Morales2014-12-041-2/+1
* Merge "Prevent Beam at the lockscreen and during provisioning" into lmp-mr1-devAndres Morales2014-11-201-0/+7
|\
| * Prevent Beam at the lockscreen and during provisioningAndres Morales2014-11-191-1/+7
* | Merge "Add verifyNfcPermission()." into lmp-mr1-devMartijn Coenen2014-11-201-0/+5
|\ \
| * | Add verifyNfcPermission().Martijn Coenen2014-11-131-0/+5
| |/
* | Merge "Restrict RF Field events to preferred app." into lmp-mr1-devMartijn Coenen2014-11-191-3/+23
|\ \
| * | Restrict RF Field events to preferred app.Martijn Coenen2014-11-121-3/+23
| |/
* / Refactor Beam to work with managed profilesAndres Morales2014-11-121-6/+5
|/
* Merge "Deactivate Beam when DISALLOW_OUTGOING_BEAM is set." into lmp-mr1-devBenjamin Franz2014-10-281-5/+49
|\
| * Deactivate Beam when DISALLOW_OUTGOING_BEAM is set.Benjamin Franz2014-10-221-5/+49
* | Reactivate Beam sharing for managed profiles.Benjamin Franz2014-10-151-2/+1
|/
* Prefix registration fixes.Martijn Coenen2014-09-161-0/+3
* Fix buildAndres Morales2014-09-151-1/+1
* Pause polling while pairing to peripheral.Andres Morales2014-09-141-1/+41
* Merge "Don't allow Beam for devices with DISALLOW_OUTGOING_BEAM" into lmp-devAndres Morales2014-09-101-2/+8
|\
| * Don't allow Beam for devices with DISALLOW_OUTGOING_BEAMAndres Morales2014-09-101-2/+8
* | Merge "Reinstate RF field events." into lmp-devMartijn Coenen2014-09-101-8/+97
|\ \
| * | Reinstate RF field events.Martijn Coenen2014-09-081-8/+97
| |/
* / Allow BLE keyboard to be paired via NFC in SWAndres Morales2014-09-041-1/+0
|/
* Merge "Remove "woosh" SOUND_START on lockscreen" into lmp-devAndres Morales2014-08-261-2/+4
|\
| * Remove "woosh" SOUND_START on lockscreenAndres Morales2014-08-211-2/+4
* | Merge "Disable Beam for managed profiles" into lmp-devAndres Morales2014-08-261-2/+10
|\ \
| * | Disable Beam for managed profilesAndres Morales2014-08-221-2/+10
| |/
* / Remove old NFC unlock APIAndres Morales2014-08-191-33/+2
|/
* Fix bug where unlock handlers are not properly removedAndres Morales2014-08-151-2/+2
* Don't play success sound after NFC unlockAndres Morales2014-08-111-5/+6
* Only allow NDEF dispatch at lockscreenAndres Morales2014-08-061-0/+1
* NFC Unlock api changesAndres Morales2014-07-301-6/+30
* Support for configuring SE listen technologies.Martijn Coenen2014-07-251-1/+11