1. 9d803cd Merge "Fix native crash in nfc_ncif_proc_activate" by Treehugger Robot · 7 years ago main master n-iot-preview-4 nougat-iot-release android-n-iot-preview-4 android-n-iot-release-ihome-igv1 android-n-iot-release-lg-thinq-wk7 android-n-iot-release-polk-at1 android-n-iot-release-smart-display android-n-iot-release-smart-display-r2 android-n-mr2-preview-1 android-n-mr2-preview-2
  2. cba7232 Fix native crash in nfc_ncif_proc_activate by fang.x.chen · 7 years ago
  3. c99d11b Merge "Split libhidl into base and transport." by Treehugger Robot · 7 years ago
  4. 5a993f3 Split libhidl into base and transport. by Yifan Hong · 7 years ago
  5. 84fd133 Merge "Remove Bluetooth remnants in bt_target.h and bt_trace.h" by Andre Eisenbach · 7 years ago
  6. 226231f Merge "Remove btu_api.h" by Andre Eisenbach · 7 years ago
  7. c81ef2a Merge "Remove DYNAMIC_MEMORY_* compile flags" by Andre Eisenbach · 7 years ago
  8. f7a43fd Remove Bluetooth remnants in bt_target.h and bt_trace.h by Andre Eisenbach · 7 years ago
  9. 6a3a3dd Remove btu_api.h by Andre Eisenbach · 7 years ago
  10. a4d43ca Remove DYNAMIC_MEMORY_* compile flags by Andre Eisenbach · 7 years ago
  11. f702c8c Merge "update NfcAdaptation to match style." by Treehugger Robot · 7 years ago
  12. 98cd45d update NfcAdaptation to match style. by Steven Moreland · 7 years ago
  13. ddfb005 Merge "Revert "Revert "Revert "update NfcAdaptation to match style."""" by Steven Moreland · 7 years ago android-n-mr1-preview-1 android-n-mr1-preview-2
  14. 4c0666e Revert "Revert "Revert "update NfcAdaptation to match style.""" by Steven Moreland · 7 years ago
  15. 24d833b Merge "Revert "Revert "update NfcAdaptation to match style.""" by Treehugger Robot · 7 years ago
  16. 9c54ce1 Revert "Revert "update NfcAdaptation to match style."" by Steven Moreland · 7 years ago
  17. b43456c Merge "Revert "update NfcAdaptation to match style."" by Martijn Coenen · 7 years ago
  18. 435f762 Revert "update NfcAdaptation to match style." by Steven Moreland · 7 years ago
  19. d62bb80 Merge "update NfcAdaptation to match style." by Steven Moreland · 7 years ago
  20. d95c939 Merge "nfc: ALOGD redefinition warning" by Treehugger Robot · 7 years ago
  21. eb20671 nfc: ALOGD redefinition warning by Mark Salyzyn · 7 years ago
  22. 09ea226 update NfcAdaptation to match style. by Steven Moreland · 7 years ago
  23. f97ec60 Merge "Switch to using the NFC HIDL HAL." by Martijn Coenen · 7 years ago
  24. e9e48e5 Switch to using the NFC HIDL HAL. by Martijn Coenen · 7 years ago
  25. e1da65f Merge "Fix log warnings in libnfc-nci" by Treehugger Robot · 7 years ago
  26. e10478d Fix log warnings in libnfc-nci by Colin Cross · 7 years ago
  27. a549a43 Merge \"Fix the syncronization issue between read thread and write thread\" by Jizhou Liao · 8 years ago
  28. d0c8ccb Merge "Fix the syncronization issue between read thread and write thread" by Martijn Coenen · 8 years ago
  29. e8d29df Merge \"Fix crash issue on reading ISO-15693 tag with more than 255 bytes NDef message.\" by Jizhou Liao · 8 years ago
  30. 95dfb69 Merge "Fix crash issue on reading ISO-15693 tag with more than 255 bytes NDef message." by Martijn Coenen · 8 years ago
  31. 40d1574 Merge \\"Fix warnings in HAL.\\" am: 1d38b130f3 am: 4e862f34b5 by Jizhou Liao · 8 years ago
  32. 4e862f3 Merge \"Fix warnings in HAL.\" am: 1d38b130f3 by Jizhou Liao · 8 years ago
  33. 1d38b13 Merge "Fix warnings in HAL." by Treehugger Robot · 8 years ago n-iot-preview-2 nougat-mr1-wear-release android-n-iot-preview-2 android-n-preview-5 android-wear-7.1.1_r1 android-wear-n-preview-2
  34. 5b5f7b7 Fix warnings in HAL. by Jizhou Liao · 8 years ago
  35. 400d445 Fix crash issue on reading ISO-15693 tag with more than 255 bytes NDef message. by Jizhou Liao · 8 years ago
  36. 082b0a9 Retry system calls on EINTR. am: 923afa2d76 by Martijn Coenen · 8 years ago
  37. 923afa2 Retry system calls on EINTR. by Martijn Coenen · 8 years ago nougat-cts-release nougat-dev nougat-release android-7.0.0_r1 android-7.0.0_r12 android-7.0.0_r13 android-7.0.0_r14 android-7.0.0_r15 android-7.0.0_r17 android-7.0.0_r19 android-7.0.0_r21 android-7.0.0_r24 android-7.0.0_r27 android-7.0.0_r28 android-7.0.0_r29 android-7.0.0_r3 android-7.0.0_r4 android-7.0.0_r5 android-7.0.0_r6 android-7.0.0_r7 android-cts-7.0_r1 android-cts-7.0_r10 android-cts-7.0_r11 android-cts-7.0_r12 android-cts-7.0_r13 android-cts-7.0_r14 android-cts-7.0_r15 android-cts-7.0_r16 android-cts-7.0_r17 android-cts-7.0_r18 android-cts-7.0_r19 android-cts-7.0_r2 android-cts-7.0_r20 android-cts-7.0_r21 android-cts-7.0_r22 android-cts-7.0_r23 android-cts-7.0_r24 android-cts-7.0_r25 android-cts-7.0_r26 android-cts-7.0_r27 android-cts-7.0_r28 android-cts-7.0_r29 android-cts-7.0_r3 android-cts-7.0_r30 android-cts-7.0_r31 android-cts-7.0_r32 android-cts-7.0_r33 android-cts-7.0_r4 android-cts-7.0_r5 android-cts-7.0_r6 android-cts-7.0_r7 android-cts-7.0_r8 android-cts-7.0_r9
  38. 7217c70 Fix the syncronization issue between read thread and write thread by Jizhou Liao · 8 years ago
  39. a1a16d4 Merge "Adding robustness to t3t callback function" am: c0e3e1e612 am: 34167af9fc by Martijn Coenen · 8 years ago
  40. 34167af Merge "Adding robustness to t3t callback function" am: c0e3e1e612 by Ken Wahid · 8 years ago
  41. c0e3e1e Merge "Adding robustness to t3t callback function" by Martijn Coenen · 8 years ago android-n-preview-3 android-n-preview-4 android-wear-n-preview-1
  42. 9c9f42f Merge "Fix warnings in external/libnfc-nci/src." am: cc6d4f1381 am: 2e97d51430 by Martijn Coenen · 8 years ago
  43. 2e97d51 Merge "Fix warnings in external/libnfc-nci/src." am: cc6d4f1381 by Jizhou Liao · 8 years ago
  44. cc6d4f1 Merge "Fix warnings in external/libnfc-nci/src." by Martijn Coenen · 8 years ago
  45. 27de314 Free memory in case of error response am: 5340dae86f by Jizhou Liao · 8 years ago
  46. 521bca9 Merge "Free memory in case of error response" am: 3a6393f85f am: ce0c63a05f by Martijn Coenen · 8 years ago
  47. ce0c63a Merge "Free memory in case of error response" am: 3a6393f85f by Jizhou Liao · 8 years ago
  48. 6b4cc13 Merge "Support NXP PN551 NFC controller" am: 45f3ed1213 am: 511e5c8030 by Martijn Coenen · 8 years ago
  49. 511e5c8 Merge "Support NXP PN551 NFC controller" am: 45f3ed1213 by Jizhou Liao · 8 years ago
  50. 5340dae Free memory in case of error response by Jizhou Liao · 8 years ago
  51. 3a6393f Merge "Free memory in case of error response" by Martijn Coenen · 8 years ago
  52. 45f3ed1 Merge "Support NXP PN551 NFC controller" by Martijn Coenen · 8 years ago
  53. 4626711 Merge "Configure nfc device node through .conf file" am: aeacb8fcb7 by Martijn Coenen · 8 years ago
  54. 885ed95 Merge "Abort NFC initialization if chip type doesn\'t match to HAL implemetation." am: d9a2f43c5b by Martijn Coenen · 8 years ago
  55. 36d7231 Support NXP PN551 NFC controller by Jizhou Liao · 8 years ago
  56. 6d8922f Merge "Configure nfc device node through .conf file" am: aeacb8fcb7 by Jizhou Liao · 8 years ago
  57. aeacb8f Merge "Configure nfc device node through .conf file" by Martijn Coenen · 8 years ago
  58. 90433ec Merge "Abort NFC initialization if chip type doesn\'t match to HAL implemetation." by Jizhou Liao · 8 years ago
  59. d9a2f43 Merge "Abort NFC initialization if chip type doesn't match to HAL implemetation." by Martijn Coenen · 8 years ago
  60. 3118b0c Configure nfc device node through .conf file by Jizhou Liao · 8 years ago
  61. 4d0b596 Update customized settings to eeprom after firmware download am: b1b86f9 by Jizhou Liao · 8 years ago
  62. b1b86f9 Update customized settings to eeprom after firmware download by Jizhou Liao · 9 years ago
  63. 65ebec5 Fix warnings in external/libnfc-nci/src. by Jizhou Liao · 8 years ago
  64. f187741 Free memory in case of error response by Jizhou Liao · 8 years ago
  65. b98e597 Abort NFC initialization if chip type doesn't match to HAL implemetation. by Jizhou Liao · 8 years ago
  66. 3eb28c8 Swap LF_T3T_FLAGS bytes for PN548 am: 8dfb5021d9 by Jizhou Liao · 8 years ago
  67. 7ab53f6 Merge "Swap LF_T3T_FLAGS bytes for PN548" am: a5e3f072ce am: 9d79b4eac3 by Martijn Coenen · 8 years ago
  68. 9d79b4e Merge "Swap LF_T3T_FLAGS bytes for PN548" am: a5e3f072ce by Martijn Coenen · 8 years ago android-n-preview-2
  69. 8dfb502 Swap LF_T3T_FLAGS bytes for PN548 by Jizhou Liao · 8 years ago
  70. a5e3f07 Merge "Swap LF_T3T_FLAGS bytes for PN548" by Martijn Coenen · 8 years ago android-n-preview-1
  71. 07adce3 Swap LF_T3T_FLAGS bytes for PN548 by Jizhou Liao · 8 years ago
  72. a496b4c Merge commit \'53494e77309c2ebe58cf8b6347e51ed5494617b3\' into HEAD by Bill Yi · 8 years ago
  73. b5f6042 Merge commit '53494e77309c2ebe58cf8b6347e51ed5494617b3' into HEAD by Bill Yi · 8 years ago
  74. f9b4ac2 Merge "Set RC=1 when only polling for T3T." am: 68f7145da1 am: 3f75b3a6c9 by Martijn Coenen · 8 years ago
  75. 3f75b3a Merge "Set RC=1 when only polling for T3T." am: 68f7145da1 by Martijn Coenen · 8 years ago
  76. 68f7145 Merge "Set RC=1 when only polling for T3T." by Martijn Coenen · 8 years ago
  77. 4c888f8 Set RC=1 when only polling for T3T. by Martijn Coenen · 8 years ago
  78. 65f6b75 Merge "libnfc-nci: silence some uninteresting warnings." am: 25fcb25880 by Elliott Hughes · 8 years ago
  79. 393c91f Merge "libnfc-nci: silence some uninteresting warnings." am: 25fcb25880 by Elliott Hughes · 8 years ago
  80. 25fcb25 Merge "libnfc-nci: silence some uninteresting warnings." by Elliott Hughes · 8 years ago
  81. 63e9060 libnfc-nci: silence some uninteresting warnings. by Elliott Hughes · 8 years ago
  82. 1cd0cee Merge "Implementation of HCE for NFC-F." am: ae2dabbe32 am: 53494e7730 by Martijn Coenen · 8 years ago
  83. 53494e7 Merge "Implementation of HCE for NFC-F." am: ae2dabbe32 by Martijn Coenen · 8 years ago
  84. ae2dabb Merge "Implementation of HCE for NFC-F." by Martijn Coenen · 8 years ago
  85. 84f6cf4 Merge "Fix rf discover notification type." am: 7d7160dda3 am: dc0e6b6249 by Martijn Coenen · 8 years ago
  86. ca3f49d Merge "Fix rf discover notification type." am: 7d7160dda3 am: dc0e6b6249 by Martijn Coenen · 8 years ago
  87. dc0e6b6 Merge "Fix rf discover notification type." am: 7d7160dda3 by Martijn Coenen · 8 years ago
  88. 7d7160d Merge "Fix rf discover notification type." by Martijn Coenen · 8 years ago
  89. 79f0821 Fix rf discover notification type. by Martijn Coenen · 8 years ago
  90. 67b137b Don\'t free memory that shouldn\'t be freed. am: 633b73f890 am: 53b8f70e4b by Martijn Coenen · 8 years ago
  91. 5a920b2 Don\'t free memory that shouldn\'t be freed. am: 633b73f890 am: 53b8f70e4b by Martijn Coenen · 8 years ago
  92. 53b8f70 Don\'t free memory that shouldn\'t be freed. am: 633b73f890 by Martijn Coenen · 8 years ago marshmallow-dr1.5-dev marshmallow-dr1.5-release marshmallow-dr1.6-release android-6.0.1_r21 android-6.0.1_r22 android-6.0.1_r24 android-6.0.1_r25 android-6.0.1_r45 android-6.0.1_r53 android-6.0.1_r54 android-6.0.1_r62 android-6.0.1_r67 android-6.0.1_r68
  93. d8c0f58 Adding robustness to t3t callback function by Ken Wahid · 9 years ago
  94. 43a0cc8 Merge "Don\'t free memory that shouldn\'t be freed." am: c4ea0a696e am: 30af63ccfe by Martijn Coenen · 8 years ago
  95. 5656a6b Merge "Don\'t free memory that shouldn\'t be freed." am: c4ea0a696e by Martijn Coenen · 8 years ago
  96. 30af63c Merge "Don\'t free memory that shouldn\'t be freed." am: c4ea0a696e by Martijn Coenen · 8 years ago
  97. c4ea0a6 Merge "Don't free memory that shouldn't be freed." by Martijn Coenen · 8 years ago
  98. c56a929 Don't free memory that shouldn't be freed. by Martijn Coenen · 8 years ago
  99. 633b73f Don't free memory that shouldn't be freed. by Martijn Coenen · 8 years ago marshmallow-dr-dragon-release android-6.0.1_r16 android-6.0.1_r18 android-6.0.1_r31 android-6.0.1_r32 android-6.0.1_r33 android-6.0.1_r4 android-6.0.1_r5 android-6.0.1_r55 android-6.0.1_r63
  100. da550d4 Merge commit \'02de621133c35cbdb7012866d11cf10627540074\' into HEAD am: 59f2e9f65e by Bill Yi · 8 years ago