summaryrefslogtreecommitdiffstats
path: root/src/com/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* Merge N-MR1 to remoteLalit Kansara2016-12-065-43/+99
|\
| * Don't dispatch tags when NDEF read times out.Martijn Coenen2016-08-311-9/+0
| * Fix Bluetooth OOB data parsingJakub Pawlowski2016-08-221-8/+1
| * 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
| * Add unregisterReceiver to fix a potential leakWei Wang2016-08-101-0/+9
| * Tron Metrics for Tag/P2P/HCE.Martijn Coenen2016-08-051-0/+29
| * Fix Nfc beam status that is stuck in wrong stategeorge.kg_chang2016-06-271-1/+2
| * Merge "nfc: Clock up temporarily when doing NFC payment transaction" into nyc...TreeHugger Robot2016-06-221-0/+10
| |\
| | * nfc: Clock up temporarily when doing NFC payment transactionles_lee2016-06-201-0/+10
* | | NFC: Adding new vendor specific interface to NFC ServicePuneet Mishra2016-08-241-0/+10
|/ /
* | Merge "Allow system_server access to NFC reader mode API." into nyc-devMartijn Coenen2016-06-211-2/+3
|\ \
| * | Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-211-2/+3
| |/
* / Allow peripheral/WiFi handover in provision mode.Martijn Coenen2016-06-211-10/+10
|/
* 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
* Merge "Nfc shouldn't initiate bluetooth connection if disallowed." into nyc-devNicolas Prévot2016-04-051-0/+8
|\
| * Nfc shouldn't initiate bluetooth connection if disallowed.Nicolas Prevot2016-04-041-0/+8
* | Don't use UserHandle.CURRENT when fetching user restrictions.Nicolas Prevot2016-04-041-1/+4
|/
* Merge "Allow foreground override in provision mode." into nyc-devMartijn Coenen2016-03-301-11/+11
|\
| * Allow foreground override in provision mode.Martijn Coenen2016-03-291-11/+11
* | Don't disable NFC in airplane mode.Martijn Coenen2016-03-291-59/+1
|/
* Keyboard Shortcuts: remove unnecessary methodClara Bayarri2016-03-211-3/+0
* Merge "Change touch to tap." into nyc-devMartijn Coenen2016-02-292-2/+2
|\
| * Change touch to tap.Martijn Coenen2016-02-292-2/+2
* | Fix references to obsolete Settings.SystemMartijn Coenen2016-02-261-4/+4
|/
* Fix broadcast name to use standard format.Martijn Coenen2016-02-181-1/+2
* Don't allow receiving files in provision mode.Martijn Coenen2016-02-081-15/+18
* resolve merge conflicts of ab0586a700 to master.Martijn Coenen2016-01-258-26/+1934
|\
| * Merge "Implementation of HCE for NFC-F."Martijn Coenen2016-01-258-26/+1934
| |\
| | * Implementation of HCE for NFC-F.Yoshinobu Ito2016-01-228-26/+1934
* | | Merge "Handle invalid handover URI" am: 56b4ca094eMartijn Coenen2016-01-251-1/+7
|\| |
| * | Handle invalid handover URIfang.x.chen2016-01-221-1/+7
| |/
* | Add optional OOB data processing for LE devicesJakub Pawlowski2016-01-194-7/+46
* | Implement API for "debouncing" NFC tags.Martijn Coenen2016-01-181-25/+45
* | Update SendUi's Window.Callback with a new methodClara Bayarri2016-01-131-0/+6
* | Follow PackageManager refactoring.Jeff Sharkey2016-01-061-1/+1
* | Update for refactorJohn Reck2015-12-021-2/+2
* | 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
* | am c14d4261: am 92f0024f: am 3ddd88c5: am b896d429: am 79458517: Fix NFC onMa...Alex Chau2015-07-291-0/+3
|\|
| * Fix NFC onManualBeamInvoke issue with policyAlex Chau2015-07-291-0/+3
* | am b2186475: am a0d5d4c0: am d02b61c3: am d1618c0a: am 0fdfe750: Use a foregr...Nicolas Prevot2015-07-241-0/+1
|\|
| * Use a foreground priority broadcast to hand over data to bluetooth.Nicolas Prevot2015-07-211-0/+1
* | am 5f1bdb42: am f4c79932: am a7f7ebfa: In BeamShareActivity, don\'t use UserH...Nicolas Prevot2015-07-041-4/+5
|\|
| * In BeamShareActivity, don't use UserHandle.CURRENT.Nicolas Prevot2015-07-011-4/+5
* | am d1a7acac: am 457e1552: am 5697d208: Disable NFC if policy disallow in fore...Alex Chau2015-06-161-2/+6
|\|
| * Disable NFC if policy disallow in foreground NDEF caseAlex Chau2015-06-151-2/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 18:33:00 +0000