summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-12-06Merge "Fix native crash in nfc_ncif_proc_activate"HEADandroid-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4nougat-iot-releasen-iot-preview-4mastermainTreehugger Robot
2016-12-06Fix native crash in nfc_ncif_proc_activatefang.x.chen
2016-11-18Merge "Split libhidl into base and transport."Treehugger Robot
2016-11-17Split libhidl into base and transport.Yifan Hong
2016-10-18Merge "Remove Bluetooth remnants in bt_target.h and bt_trace.h"Andre Eisenbach
2016-10-18Merge "Remove btu_api.h"Andre Eisenbach
2016-10-18Merge "Remove DYNAMIC_MEMORY_* compile flags"Andre Eisenbach
2016-10-18Remove Bluetooth remnants in bt_target.h and bt_trace.hAndre Eisenbach
2016-10-18Remove btu_api.hAndre Eisenbach
2016-10-18Remove DYNAMIC_MEMORY_* compile flagsAndre Eisenbach
2016-10-17Merge "update NfcAdaptation to match style."Treehugger Robot
2016-10-14update NfcAdaptation to match style.Steven Moreland
2016-10-06Merge "Revert "Revert "Revert "update NfcAdaptation to match style.""""android-n-mr1-preview-2android-n-mr1-preview-1Steven Moreland
2016-10-06Revert "Revert "Revert "update NfcAdaptation to match style."""Steven Moreland
2016-10-05Merge "Revert "Revert "update NfcAdaptation to match style."""Treehugger Robot
2016-10-05Revert "Revert "update NfcAdaptation to match style.""Steven Moreland
2016-10-04Merge "Revert "update NfcAdaptation to match style.""Martijn Coenen
2016-10-04Revert "update NfcAdaptation to match style."Steven Moreland
2016-10-04Merge "update NfcAdaptation to match style."Steven Moreland
2016-09-29Merge "nfc: ALOGD redefinition warning"Treehugger Robot
2016-09-29nfc: ALOGD redefinition warningMark Salyzyn
2016-09-29update NfcAdaptation to match style.Steven Moreland
2016-09-29Merge "Switch to using the NFC HIDL HAL."Martijn Coenen
2016-09-26Switch to using the NFC HIDL HAL.Martijn Coenen
2016-09-22Merge "Fix log warnings in libnfc-nci"Treehugger Robot
2016-09-18Fix log warnings in libnfc-nciColin Cross
2016-07-22Merge \"Fix the syncronization issue between read thread and write thread\"Jizhou Liao
2016-07-22Merge "Fix the syncronization issue between read thread and write thread"Martijn Coenen
2016-07-20Merge \"Fix crash issue on reading ISO-15693 tag with more than 255 bytes NDe...Jizhou Liao
2016-07-20Merge "Fix crash issue on reading ISO-15693 tag with more than 255 bytes NDef...Martijn Coenen
2016-06-24Merge \\"Fix warnings in HAL.\\" am: 1d38b130f3Jizhou Liao
2016-06-24Merge \"Fix warnings in HAL.\"Jizhou Liao
2016-06-24Merge "Fix warnings in HAL."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Treehugger Robot
2016-06-16Fix warnings in HAL.Jizhou Liao
2016-06-15Fix crash issue on reading ISO-15693 tag with more than 255 bytes NDef message.Jizhou Liao
2016-06-15Retry system calls on EINTR.Martijn Coenen
2016-06-14Retry system calls on EINTR.android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-devnougat-cts-releasenougat-bugfix-releaseMartijn Coenen
2016-05-31Fix the syncronization issue between read thread and write threadJizhou Liao
2016-05-13Merge "Adding robustness to t3t callback function" am: c0e3e1e612Martijn Coenen
2016-05-13Merge "Adding robustness to t3t callback function"Ken Wahid
2016-05-13Merge "Adding robustness to t3t callback function"android-wear-n-preview-3android-wear-n-preview-1android-n-preview-4android-n-preview-3Martijn Coenen
2016-05-13Merge "Fix warnings in external/libnfc-nci/src." am: cc6d4f1381Martijn Coenen
2016-05-13Merge "Fix warnings in external/libnfc-nci/src."Jizhou Liao
2016-05-13Merge "Fix warnings in external/libnfc-nci/src."Martijn Coenen
2016-05-12Free memory in case of error responseJizhou Liao
2016-05-11Merge "Free memory in case of error response" am: 3a6393f85fMartijn Coenen
2016-05-11Merge "Free memory in case of error response"Jizhou Liao
2016-05-11Merge "Support NXP PN551 NFC controller" am: 45f3ed1213Martijn Coenen
2016-05-11Merge "Support NXP PN551 NFC controller"Jizhou Liao
2016-05-11Free memory in case of error responseJizhou Liao