summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Add READ_EXTERNAL_STORAGE for file based Uri while beaming.replicant-6.0-0003Ruchi Kandoi2017-09-201-2/+18
* Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-021-2/+3
|\
| * Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-231-2/+3
* | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-071-1/+8
|\|
| * Verify setForegroundDispatch caller is in foreground.Martijn Coenen2016-05-271-1/+8
* | Revert "Nfc: Clear transfer manager service on Destroy"Roman Birg2016-06-101-1/+0
* | Revert "nfc: create a bootstrap service"Roman Birg2016-06-101-39/+0
* | NFC: Adding new vendor specific interface to NFC ServicePuneet Mishra2016-05-231-0/+10
* | Nfc: Clear transfer manager service on DestroyPat Erley2016-05-171-0/+1
* | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/pac...Steve Kondik2015-12-071-0/+4
|\|
| * Don't enable reader mode when NFC is disabled.Martijn Coenen2015-10-191-0/+4
* | nfc: create a bootstrap serviceJorge Ruesga2015-11-071-0/+39
* | NFCService: Add sysprop to prevent FW download during boot with NFC off.Tony Layher2015-11-071-1/+12
|/
* Fix NFC onManualBeamInvoke issue with policyAlex Chau2015-07-291-0/+3
* Use a foreground priority broadcast to hand over data to bluetooth.Nicolas Prevot2015-07-211-0/+1
* In BeamShareActivity, don't use UserHandle.CURRENT.Nicolas Prevot2015-07-011-4/+5
* Disable NFC if policy disallow in foreground NDEF caseAlex Chau2015-06-151-2/+6
* NFC: Move playSound to BeamManager (DO NOT MERGE).Atsushi Suga2015-05-193-39/+23
* Always play sound on send resume.Martijn Coenen2015-05-111-2/+2
* Why is NFC using PhoneWindow directly...?Adam Powell2015-05-061-1/+1
* Fix NfcService crash when handover busySatoshi Fujita2015-04-281-1/+1
* Beam / LLCP improvements.Martijn Coenen2015-04-283-129/+29
* am ea9ba101: am e8b5bb64: Merge "Fix peripheral handover issues"Martijn Coenen2015-04-202-8/+31
|\
| * Merge "Fix peripheral handover issues"Martijn Coenen2015-04-202-8/+31
| |\
| | * Fix peripheral handover issuesBalachandar Swami2015-04-152-8/+31
* | | am 46c6f9cf: am b6b45036: Merge "Expose peer LLCP version to apps."Martijn Coenen2015-04-173-6/+9
|\| |
| * | Merge "Expose peer LLCP version to apps."Martijn Coenen2015-04-173-6/+9
| |\ \
| | * | Expose peer LLCP version to apps.Martijn Coenen2015-04-153-6/+9
| | |/
* | | am ea6c6c91: am e1214dab: Merge "Clear NFC task on launch."Martijn Coenen2015-04-154-4/+4
|\| |
| * | Merge "Clear NFC task on launch."Martijn Coenen2015-04-154-4/+4
| |\ \
| | * | Clear NFC task on launch.Martijn Coenen2015-04-154-4/+4
| | |/
* | | am 6b901740: am 3651f412: Merge "Don\'t allow overlapping AID registrations."Martijn Coenen2015-04-152-2/+19
|\| |
| * | Don't allow overlapping AID registrations.Martijn Coenen2015-04-152-2/+19
| |/
* | am cd4baf78: am 09aed954: Merge "Add missing @Override"Martijn Coenen2015-04-141-0/+1
|\|
| * Add missing @OverrideMathias Jeppsson2015-04-081-0/+1
* | Add new onSearchRequested overloadTim Kilbourn2015-04-131-0/+6
* | am a9c94013: am d5889a41: Merge "Implement URI decode scheme for NfcBarcode t...Andres Morales2015-04-011-0/+69
|\|
| * Implement URI decode scheme for NfcBarcode tag technologyBartek Teodorczyk2015-03-311-0/+69
* | Add new method implementation for Window.CallbackClara Bayarri2015-03-121-0/+5
* | Merge "Split up android.policy into framework.jar and services.jar 2/3"Jorim Jaggi2015-02-101-2/+2
|\ \
| * | Split up android.policy into framework.jar and services.jar 2/3Jorim Jaggi2015-02-051-2/+2
* | | am 24a81280: am 8f447163: am 15d2dfc3: Re-add quotes for network key and ssidAndres Morales2015-02-061-2/+2
|\ \ \ | |/ / |/| / | |/
| * am 8f447163: am 15d2dfc3: Re-add quotes for network key and ssidAndres Morales2015-02-061-2/+2
| |\
| | * Re-add quotes for network key and ssidAndres Morales2015-02-041-2/+2
* | | am 4d2610ca: am 8183601c: am afc67ea9: Merge "Only set WPA_PSK for WPA_PSK an...Andres Morales2015-01-231-7/+1
|\| |
| * | am 8183601c: am afc67ea9: Merge "Only set WPA_PSK for WPA_PSK and WPA2_PSK" i...Andres Morales2015-01-211-7/+1
| |\|
| | * Merge "Only set WPA_PSK for WPA_PSK and WPA2_PSK" into lmp-mr1-devAndres Morales2015-01-211-7/+1
| | |\
| | | * Only set WPA_PSK for WPA_PSK and WPA2_PSKAndres Morales2015-01-091-7/+1
* | | | am e5ef0ef8: am 613c66fc: am ac28fac6: Merge "Remove asterisk from AID when r...Andres Morales2014-12-101-1/+17
|\| | |
| * | | am 613c66fc: am ac28fac6: Merge "Remove asterisk from AID when removing prefi...Andres Morales2014-12-101-1/+17
| |\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 15:45:48 +0000