summaryrefslogtreecommitdiffstats
path: root/src/com/android/nfc/NfcService.java
Commit message (Expand)AuthorAgeFilesLines
* Verify setForegroundDispatch caller is in foreground.stable/cm-12.1-YOG7DMartijn Coenen2016-07-081-1/+8
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3CRicardo Cerqueira2015-03-101-18/+91
|\
| * 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
| |/
* / NFCService: Add sysprop to prevent FW download during boot with NFC off.stable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1ITony Layher2015-02-151-1/+12
|/
* 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
* Merge "Don't show Beam in share menu if turned off." into lmp-devMartijn Coenen2014-07-231-0/+11
|\
| * Don't show Beam in share menu if turned off.Martijn Coenen2014-07-211-0/+11
* | Don't restart discovery if NFC was turned off.Martijn Coenen2014-07-211-6/+8
|/
* Merge "Fix invoking Beam from share menu for multi-user."Martijn Coenen2014-07-011-33/+34
|\
| * Fix invoking Beam from share menu for multi-user.Martijn Coenen2014-07-011-33/+34
* | Don't conditionally enable snooze.Martijn Coenen2014-06-271-1/+1
|/
* Refactoring NfcService routing logic.Andres Morales2014-06-251-125/+65
* Fix duplicate tag dispatch after NFC triggered unlockAndres Morales2014-06-201-12/+39
* Adding NFC TrustletAndres Morales2014-06-191-21/+70
* am 8069265a: Initialize polling mode correctly.Martijn Coenen2014-05-291-7/+1
|\
| * Initialize polling mode correctly.Martijn Coenen2014-05-281-7/+1
* | Merge "Goodbye secure element."Martijn Coenen2014-05-231-739/+9
|\ \ | |/ |/|
| * Goodbye secure element.Martijn Coenen2014-05-191-739/+9
* | Reverting NFC Unlock from Nfc application.Andres Morales2014-05-201-27/+3
|/
* Fix NPE in case device doesn't support HCE.Martijn Coenen2014-04-241-1/+5
* Support for dynamic AID registration.Martijn Coenen2014-04-181-92/+17
* Android Beam direct invoke / share menu invoking.Martijn Coenen2014-02-241-0/+51
* Revert "Refactoring NfcService routing logic."Andres Morales2014-02-041-125/+96
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 23:02:17 +0000