summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bluetooth Beam bug fixes, UX and i18n.Martijn Coenen2012-05-106-113/+307
* Call right Bluetooth enable API.Martijn Coenen2012-04-261-1/+1
* Merge "Latest changes for Bluetooth Beam."Martijn Coenen2012-04-244-39/+390
|\
| * Latest changes for Bluetooth Beam.Martijn Coenen2012-04-204-39/+390
* | Fix to avoid a semaphore issue during the SE opendanieltomas2012-04-201-4/+25
* | Added shared prefs for SE wired modeSunil Jogi2012-04-205-17/+70
* | Updated disable methodSunil Jogi2012-04-201-2/+5
* | Added delay before NFC system recoverySunil Jogi2012-04-202-0/+2
|/
* Import translations. DO NOT MERGEEric Fischer2012-04-161-1/+1
* Merge "Import translations. DO NOT MERGE"Eric Fischer2012-04-131-1/+1
|\
| * Import translations. DO NOT MERGEEric Fischer2012-04-131-1/+1
* | Support for the new Uri[] Beam push API.Martijn Coenen2012-04-123-36/+57
|/
* Fix backup key for Nfc.Martijn Coenen2012-04-061-1/+1
* Force bluetooth OPP to handle ACTION_SEND.Martijn Coenen2012-04-051-1/+2
* Add support for making Mifare Classic readonly.Martijn Coenen2012-04-053-7/+19
* First cut at Bluetooth BeamNick Pelly2012-04-045-11/+208
* Merge "Support for querying extended length APDU support."Martijn Coenen2012-04-043-0/+12
|\
| * Support for querying extended length APDU support.Martijn Coenen2012-04-023-0/+12
* | Merge "Allow applications to disable default Beam behavior."Martijn Coenen2012-04-041-13/+43
|\ \
| * | Allow applications to disable default Beam behavior.Martijn Coenen2012-04-041-13/+43
| |/
* | Merge "Remote debug logging info."Nick Pelly2012-04-031-1/+1
|\ \ | |/ |/|
| * Remote debug logging info.Nick Pelly2012-04-031-1/+1
* | Merge "Let connect() fail with an I/O exception if tag has left the field."Martijn Coenen2012-03-301-0/+4
|\ \
| * | Let connect() fail with an I/O exception if tag has left the field.Martijn Coenen2012-03-291-0/+4
* | | Merge "Remove permissions check from the TagService."Martijn Coenen2012-03-301-24/+2
|\ \ \ | |/ /
| * | Remove permissions check from the TagService.Martijn Coenen2012-03-291-24/+2
* | | Merge "Fix NPE when there's NDEF data we can't dispatch."Martijn Coenen2012-03-291-1/+2
|\ \ \
| * | | Fix NPE when there's NDEF data we can't dispatch.Martijn Coenen2012-03-081-1/+2
* | | | Merge "Get rid of getLastError()."Martijn Coenen2012-03-293-9/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Get rid of getLastError().Martijn Coenen2012-03-293-9/+2
* | | Merge "Don't crash on passing invalid data to NfcService."Martijn Coenen2012-03-291-0/+2
|\ \ \
| * | | Don't crash on passing invalid data to NfcService.Martijn Coenen2012-03-281-0/+2
* | | | Merge "Keep static NDEF in application rather than NFC Service."Nick Pelly2012-03-292-15/+9
|\ \ \ \
| * | | | Keep static NDEF in application rather than NFC Service.Nick Pelly2012-03-282-15/+9
* | | | | Merge "Dejank Android Beam animation."Martijn Coenen2012-03-284-486/+582
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Dejank Android Beam animation.Martijn Coenen2012-03-284-486/+582
* | | | Merge "Update URL from Market to Play. Add feature parameter."Nick Pelly2012-03-281-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Update URL from Market to Play. Add feature parameter.Nick Pelly2012-03-211-2/+2
| |/ /
* | | Merge remote-tracking branch 'goog/ics-aah-exp'Mike Lockwood2012-03-210-0/+0
|\ \ \
| * | | Use the new "appliance" ui mode configuration to determine whether to show nf...Joe Onorato2011-12-141-1/+10
| * | | am 985dcef8: Fix Beam&Tag failures after opening NFC-EE.Nick Pelly2011-12-071-22/+23
| |\ \ \
| * \ \ \ am 16ac4580: Import revised translations. DO NOT MERGEEric Fischer2011-12-071-1/+1
| |\ \ \ \
| * \ \ \ \ am 92250f5c: Fix mismatched link()/unlink() causing NFC-EE to be stuck open.Nick Pelly2011-12-011-14/+25
| |\ \ \ \ \
| * \ \ \ \ \ am 951dad2b: Restore deleted string still referenced from manifest.Eric Fischer2011-11-291-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 3a675100: Merge "Fix NdefFormatable not showing up for NfcA technologies."...Martijn Coenen2011-11-282-75/+61
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.ap...Nick Pelly2011-11-218-16/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 806a7827: Merge "Also send NFCEE broadcasts to dynamically registered rece...Martijn Coenen2011-11-171-9/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 078e8368: Merge "Set up DISCOVERY and SE notification callbacks at NFC ini...Nick Pelly2011-11-171-62/+69
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am bc6535cc: Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-1648-96/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 59137f77: No-op merge from ics-mr0The Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \