summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-05-11Merge "Free memory in case of error response"Martijn Coenen
2016-05-11Merge "Support NXP PN551 NFC controller"Martijn Coenen
2016-05-10Merge "Configure nfc device node through .conf file" am: aeacb8fcb7Martijn Coenen
2016-05-10Merge "Abort NFC initialization if chip type doesn\'t match to HAL implemetat...Martijn Coenen
2016-05-10Support NXP PN551 NFC controllerJizhou Liao
2016-05-10Merge "Configure nfc device node through .conf file"Jizhou Liao
2016-05-10Merge "Configure nfc device node through .conf file"Martijn Coenen
2016-05-10Merge "Abort NFC initialization if chip type doesn\'t match to HAL implemetat...Jizhou Liao
2016-05-10Merge "Abort NFC initialization if chip type doesn't match to HAL implemetati...Martijn Coenen
2016-04-26Configure nfc device node through .conf fileJizhou Liao
2016-04-25Update customized settings to eeprom after firmware downloadJizhou Liao
2016-04-25Update customized settings to eeprom after firmware downloadJizhou Liao
2016-04-06Fix warnings in external/libnfc-nci/src.Jizhou Liao
2016-03-22Free memory in case of error responseJizhou Liao
2016-03-02Abort NFC initialization if chip type doesn't match to HAL implemetation.Jizhou Liao
2016-02-22Swap LF_T3T_FLAGS bytes for PN548Jizhou Liao
2016-02-22Merge "Swap LF_T3T_FLAGS bytes for PN548" am: a5e3f072ceMartijn Coenen
2016-02-22Merge "Swap LF_T3T_FLAGS bytes for PN548"android-n-preview-2Martijn Coenen
2016-02-22Swap LF_T3T_FLAGS bytes for PN548Jizhou Liao
2016-02-22Merge "Swap LF_T3T_FLAGS bytes for PN548"android-n-preview-1Martijn Coenen
2016-02-22Swap LF_T3T_FLAGS bytes for PN548Jizhou Liao
2016-02-17Merge commit \'53494e77309c2ebe58cf8b6347e51ed5494617b3\' into HEADBill Yi
2016-02-17Merge commit '53494e77309c2ebe58cf8b6347e51ed5494617b3' into HEADBill Yi
2016-02-04Merge "Set RC=1 when only polling for T3T." am: 68f7145da1Martijn Coenen
2016-02-04Merge "Set RC=1 when only polling for T3T."Martijn Coenen
2016-02-04Merge "Set RC=1 when only polling for T3T."Martijn Coenen
2016-02-03Set RC=1 when only polling for T3T.Martijn Coenen
2016-01-22Merge "libnfc-nci: silence some uninteresting warnings." am: 25fcb25880Elliott Hughes
2016-01-22Merge "libnfc-nci: silence some uninteresting warnings."Elliott Hughes
2016-01-22Merge "libnfc-nci: silence some uninteresting warnings."Elliott Hughes
2016-01-21libnfc-nci: silence some uninteresting warnings.Elliott Hughes
2016-01-08Merge "Implementation of HCE for NFC-F." am: ae2dabbe32Martijn Coenen
2016-01-08Merge "Implementation of HCE for NFC-F."Martijn Coenen
2016-01-08Merge "Implementation of HCE for NFC-F."Martijn Coenen
2015-11-25Merge "Fix rf discover notification type." am: 7d7160dda3 am: dc0e6b6249Martijn Coenen
2015-11-25Merge "Fix rf discover notification type." am: 7d7160dda3Martijn Coenen
2015-11-25Merge "Fix rf discover notification type."Martijn Coenen
2015-11-25Merge "Fix rf discover notification type."Martijn Coenen
2015-11-24Fix rf discover notification type.Martijn Coenen
2015-11-05Don\'t free memory that shouldn\'t be freed. am: 633b73f890 am: 53b8f70e4bMartijn Coenen
2015-11-05Don\'t free memory that shouldn\'t be freed. am: 633b73f890Martijn Coenen
2015-11-05Don\'t free memory that shouldn\'t be freed.android-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devMartijn Coenen
2015-11-05Adding robustness to t3t callback functionKen Wahid
2015-11-05Merge "Don\'t free memory that shouldn\'t be freed." am: c4ea0a696e am: 30af6...Martijn Coenen
2015-11-05Merge "Don\'t free memory that shouldn\'t be freed." am: c4ea0a696eMartijn Coenen
2015-11-05Merge "Don\'t free memory that shouldn\'t be freed."Martijn Coenen
2015-11-05Merge "Don't free memory that shouldn't be freed."Martijn Coenen
2015-11-05Don't free memory that shouldn't be freed.Martijn Coenen
2015-11-05Don't free memory that shouldn't be freed.android-6.0.1_r63android-6.0.1_r55android-6.0.1_r5android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r18android-6.0.1_r16marshmallow-dr-dragon-releaseMartijn Coenen
2015-11-03Merge commit \'02de621133c35cbdb7012866d11cf10627540074\' into HEAD am: 59f2e...Bill Yi