summaryrefslogtreecommitdiffstats
path: root/src/com/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\| |
| | * | Merge "Remove asterisk from AID when removing prefix entries" into lmp-mr1-devAndres Morales2014-12-101-1/+17
| | |\ \
| | | * | Remove asterisk from AID when removing prefix entriesPaul Chaisson2014-12-081-1/+17
| | | |/
* | | | am 79341c7f: am fdc1c661: am f96571b1: Merge "Remove B\' polling for B tags" ...Andres Morales2014-12-051-2/+1
|\| | |
| * | | am fdc1c661: am f96571b1: Merge "Remove B\' polling for B tags" into lmp-mr1-devAndres Morales2014-12-051-2/+1
| |\| |
| | * | Remove B' polling for B tagsAndres Morales2014-12-041-2/+1
| | |/
* | | am a986b0a1: am da844e16: am 95302c11: Read UserHandle from passed in ShareDataAndres Morales2014-12-031-1/+3
|\| |
| * | am da844e16: am 95302c11: Read UserHandle from passed in ShareDataAndres Morales2014-12-021-1/+3
| |\|
| | * Read UserHandle from passed in ShareDataAndres Morales2014-12-021-1/+3
* | | am 7f0cbe5d: am 0cc0fe84: am 4f146f35: Merge "Fix NfcDiscoveryParameters" int...Andres Morales2014-11-251-2/+5
|\| |
| * | am 0cc0fe84: am 4f146f35: Merge "Fix NfcDiscoveryParameters" into lmp-mr1-devAndres Morales2014-11-251-2/+5
| |\|
| | * Fix NfcDiscoveryParametersAndres Morales2014-11-241-2/+5
* | | am f5f07661: am 10e647dd: am 8a80bc7b: Merge "Prevent Beam at the lockscreen ...Andres Morales2014-11-252-9/+21
|\| |
| * | am 10e647dd: am 8a80bc7b: Merge "Prevent Beam at the lockscreen and during pr...Andres Morales2014-11-252-9/+21
| |\|
| | * Merge "Prevent Beam at the lockscreen and during provisioning" into lmp-mr1-devAndres Morales2014-11-202-9/+21
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 03:19:35 +0000