summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix crash when invoking Beam with NFC off.marshmallow-devMartijn Coenen2015-08-241-1/+1
* 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
* Import translations. DO NOT MERGEGeoff Mendal2015-07-154-7/+7
* In BeamShareActivity, don't use UserHandle.CURRENT.Nicolas Prevot2015-07-011-4/+5
* New permission in Nfc stack to allow client validation.Rubin Xu2015-06-191-0/+1
* Disable NFC if policy disallow in foreground NDEF caseAlex Chau2015-06-151-2/+6
* Add LOCAL_MAC_ADDRESS permission.Martijn Coenen2015-06-041-0/+1
* Import translations. DO NOT MERGEGeoff Mendal2015-05-302-7/+50
* 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
* Import translations. DO NOT MERGEGeoff Mendal2015-04-226-0/+225
* am ea9ba101: am e8b5bb64: Merge "Fix peripheral handover issues"Martijn Coenen2015-04-202-8/+31
|\
| * 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-176-6/+24
|\| | |
| * | | am b6b45036: Merge "Expose peer LLCP version to apps."Martijn Coenen2015-04-176-6/+24
| |\| |
| | * | Merge "Expose peer LLCP version to apps."Martijn Coenen2015-04-176-6/+24
| | |\ \
| | | * | Expose peer LLCP version to apps.Martijn Coenen2015-04-156-6/+24
| | | |/
* | | | am ea6c6c91: am e1214dab: Merge "Clear NFC task on launch."Martijn Coenen2015-04-154-4/+4
|\| | |
| * | | 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
|\| | |
| * | | am 3651f412: Merge "Don\'t allow overlapping AID registrations."Martijn Coenen2015-04-152-2/+19
| |\| |
| | * | 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
|\| |
| * | am 09aed954: Merge "Add missing @Override"Martijn Coenen2015-04-141-0/+1
| |\|
| | * 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
* | | Merge "Stop building NXP stack."Martijn Coenen2015-04-133-25/+6
|\ \ \
| * | | Stop building NXP stack.Martijn Coenen2015-04-093-25/+6
* | | | Declare that Nfc app does not use cleartext network traffic.Alex Klyubin2015-04-021-0/+1
* | | | am a9c94013: am d5889a41: Merge "Implement URI decode scheme for NfcBarcode t...Andres Morales2015-04-011-0/+69
|\ \ \ \ | | |/ / | |/| |
| * | | am d5889a41: Merge "Implement URI decode scheme for NfcBarcode tag technology"Andres Morales2015-04-011-0/+69
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Implement URI decode scheme for NfcBarcode tag technology"android-wear-5.1.1_r1android-wear-5.1.0_r1Andres Morales2015-04-011-0/+69
| | |\ \
| | | * | Implement URI decode scheme for NfcBarcode tag technologyBartek Teodorczyk2015-03-311-0/+69
| | |/ /
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-301-0/+26
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-2774-26/+73
| |_|/ |/| |
* | | Added new provisioning mime type: application/com.android.managedprovisioning.v2Andrei Kapishnikov2015-03-251-0/+1
* | | Import translations. DO NOT MERGEGeoff Mendal2015-03-212-0/+74
* | | Import translations. DO NOT MERGEGeoff Mendal2015-03-161-1/+1
* | | Add new method implementation for Window.CallbackClara Bayarri2015-03-121-0/+5
* | | am 63cec9dd: (-s ours) am 3e6fe48c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
|\| |