summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [DO NOT MERGE]Prevent length underflow in NfcTag.cppcm-14.1George Chang2019-10-081-1/+9
* Prevent OOB Read in Mfc_TransceiveGeorge Chang2019-08-131-0/+5
* Prevent OOB write in Mfc_TransceiveGeorge Chang2019-08-131-0/+6
* Prevent OOB write in phFriNfc_ExtnsTransceiveGeorge Chang2019-08-131-0/+7
* Automatic translation importMichael Bestas2019-08-061-1/+1
* Automatic translation importMichael Bestas2019-03-1113-544/+168
* Automatic translation importMichael Bestas2018-10-142-0/+3
* NFC: Clean duplicated and unknown permissionsAdrianDC2018-06-141-3/+0
* Automatic translation importMichael Bestas2018-03-281-0/+1
* Automatic translation importMichael Bestas2018-02-042-0/+72
* Automatic translation importMichael W2018-01-131-0/+2
* Automatic translation importAbhisek Devkota2017-12-162-0/+72
* Automatic translation importAbhisek Devkota2017-12-111-0/+36
* Make Transceive Length configurable for ISO DEP TechnologyRuchi Kandoi2017-11-172-8/+35
* Automatic translation importAbhisek Devkota2017-09-181-11/+4
* Add READ_EXTERNAL_STORAGE for file based Uri while beaming.Ruchi Kandoi2017-09-151-2/+18
* NfcNci: make T3T/Nfc-F HCE optionalSimon Shields2017-06-142-8/+19
* Nfc: Include android-support-v4 for the NXP stackstaging/cm-14.1_android-7.1.2_r2Adrian DC2017-04-121-0/+2
* Merge tag 'android-7.1.2_r2' into cm-14.1Dan Pasanen2017-04-0597-63/+2506
|\
| * Import translations. DO NOT MERGEBill Yi2017-02-021-1/+1
| * Import translations. DO NOT MERGEBill Yi2017-01-1880-0/+2320
| * Adds functionality to detect live case NFC tags on lock screen.Ruchi Kandoi2017-01-123-7/+101
| * payment: Do not reset the default payment is non-null.Ruchi Kandoi2017-01-061-43/+1
| * Add android.nfc.tech.ndef to unformatted NFC tagsRuchi Kandoi2016-12-151-2/+8
| * Use FileProvider rather than sharing raw file URIJohan Redestig2016-12-024-2/+20
| * Fix unresponsive touch screen after NFC WPS dialog is closedxin.li2016-12-021-0/+1
| * BLE OOB Pairing - parse address type (4/5)Jakub Pawlowski2016-11-101-0/+9
| * Add LE Secure Connection data parsing (4/4)Jakub Pawlowski2016-11-101-2/+39
| * Import translations. DO NOT MERGEBill Yi2016-11-045-6/+6
| * Don't dispatch tags when NDEF read times out. am: 6e95c4d9daMartijn Coenen2016-08-313-14/+3
| |\
| * \ Fix Bluetooth OOB data parsing am: b0cc05288dJakub Pawlowski2016-08-230-0/+0
| |\ \
| * \ \ Fix Bluetooth OOB data parsingJakub Pawlowski2016-08-221-8/+1
| |\ \ \
| * \ \ \ Fix Tron stats reporting.Martijn Coenen2016-08-171-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-111-0/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Tron Metrics for Tag/P2P/HCE.Martijn Coenen2016-08-081-0/+29
| |\ \ \ \ \ \ \
* | | | | | | | | Automatic translation importcm-14.1_oldAbhisek Devkota2017-03-201-0/+4
* | | | | | | | | Automatic translation importAbhisek Devkota2017-03-151-0/+11
* | | | | | | | | Automatic translation importMichael W2017-03-021-30/+0
* | | | | | | | | Automatic translation importAbhisek Devkota2017-02-161-0/+36
* | | | | | | | | Automatic translation importstaging/cm-14.1-cafrebaseinky@build012016-12-3018-0/+764
* | | | | | | | | Nfc: read extra properties of Mifare ClassicHamster Tian2016-12-301-0/+11
* | | | | | | | | Revert "Stop building NXP stack."Bruno Martins2016-12-303-6/+25
* | | | | | | | | Merge b516b5681783ea38a834d77fc02926737472076f on remote branchLinux Build Service Account2016-12-1512-62/+119
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Merge N-MR1 to remoteLalit Kansara2016-12-0612-62/+119
|/| | | | | | | | |
| * | | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-010-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-230-0/+0
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | | * | | | | | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-170-0/+0
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | | * | | | | | Allow for ignore() to work with random UID tags.Martijn Coenen2016-08-111-31/+43
| | | | | |_|/ / / | | | | |/| | | |
| * | | | | | | | Don't dispatch tags when NDEF read times out.Martijn Coenen2016-08-313-14/+3
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |