summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-03-15Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEADandroid-6.0.1_r81android-6.0.1_r80marshmallow-mr2-releaseBill Yi
2017-01-27Fix native crash in nfc_ncif_proc_activatefang.x.chen
2017-01-20Fix native crash in nfc_ncif_proc_activatefang.x.chen
2015-11-05Don't free memory that shouldn't be freed.android-6.0.1_r9android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr1-releaseMartijn Coenen
2015-11-02Fix 256-bit Thinfilm NFC barcode.Martijn Coenen
2015-10-13Use global all-cpp-files-undermarshmallow-mr1-devDan Willemsen
2015-09-25Fix fail to write RF parametersmarshmallow-dr-devJizhou Liao
2015-09-22add recovery mechanism on CORE_RESET_NTFJizhou Liao
2015-09-07Finalize .conf fileJizhou Liao
2015-08-28Add Mifare Classic support.Jizhou Liao
2015-08-21Fix stuck issue on Kovio barcodeJizhou Liao
2015-08-20Adding MiFARE DESFire format supportJizhou Liao
2015-08-20Merge "Fix ISO15693 tag crash issue" into mnc-dr-devMartijn Coenen
2015-08-19Handle notification type value 1 in RF_DISCOVER_NTFJizhou Liao
2015-08-19Fix Mifare Classic presence check.Martijn Coenen
2015-08-18Fix ISO15693 tag crash issueJizhou Liao
2015-08-07Merge "Bump libnfc-nci version for M." into mnc-dr-devMartijn Coenen
2015-08-07Bump libnfc-nci version for M.Martijn Coenen
2015-08-03Fix conflict vendor proprietary Protocol and Discovery technology definitionsJizhou Liao
2015-08-03Add Peer-To-Peer priority mechanismJizhou Liao
2015-08-03ISO-DEP presence check workaroundJizhou Liao
2015-07-23Avoid routing table update if nothing changed.Jizhou Liao
2015-07-20Update customized settings to eeprom after firmware downloadJizhou Liao
2015-07-20T1T HR0 and HR1 parameters missing.Jizhou Liao
2015-07-15Memory leak and NULL pointer check fixes.Jizhou Liao
2015-06-29Add NFC-DEP routingandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-devmarshmallow-cts-releaseJizhou Liao
2015-05-20Adding NXP NCI Hal implementation (DO NOT MERGE.)Jizhou Liao
2015-04-16Merge "Fix <string.h> include."master-soongMartijn Coenen
2015-04-16Fix <string.h> include.Martijn Coenen
2015-04-16Merge "Bump LLCP version to 1.2"Martijn Coenen
2015-04-16Merge "Add system prop for enabling protocol logging"Martijn Coenen
2015-04-15Bump LLCP version to 1.2Martijn Coenen
2015-04-15Add system prop for enabling protocol loggingAndres Morales
2015-03-18Merge "Add NOTICE and MODULE_LICENSE"android-wear-5.1.1_r1android-wear-5.1.0_r1Conley Owens
2015-03-12Add NOTICE and MODULE_LICENSEConley Owens
2015-01-30am 33fc4b74: Merge "Add missing includes."Elliott Hughes
2015-01-30Merge "Add missing includes."Elliott Hughes
2015-01-29Add missing includes.Elliott Hughes
2015-01-28am 734ebfac: Merge "Add missing includes."Elliott Hughes
2015-01-28Merge "Add missing includes."Elliott Hughes
2015-01-28Add missing includes.Elliott Hughes
2014-12-16am 9e3ff8f6: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
2014-12-16Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
2014-12-16Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang
2014-11-17am 97dff702: Merge "Move libnfc-nci to libc++."Dan Albert
2014-11-17Merge "Move libnfc-nci to libc++."android-wear-5.0.0_r1lollipop-wear-releaseDan Albert
2014-11-15Move libnfc-nci to libc++.Dan Albert
2014-10-26am 26617dd4: am 90186191: Merge "Don\'t set a pthread_t to NULL"Martijn Coenen
2014-10-26am 25318f32: am 4b981bc8: Merge "Fix Clang compilation errors."Chih-Hung Hsieh
2014-10-26am 324f25d9: am ed2d14c1: Merge "Fix null pointer dereference." into lmp-devMartijn Coenen
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 08:29:49 +0000