Merge commit '4c50959717fcf4b5bf10721b4dda0d2c2f423eaf' into merge

diff --cc include/hardware_legacy/wifi_logger.h
index 089f138,fb4edbb..69326da
--- 1/include/hardware_legacy/wifi_logger.h
--- 2/include/hardware_legacy/wifi_logger.h
+++ b/include/hardware_legacy/wifi_logger.h
@@@ -279,18 -288,20 +288,19 @@@ wifi_error wifi_get_firmware_version(wi
  \r
  /* api to collect a driver version string */\r
  wifi_error wifi_get_driver_version(wifi_request_id id,\r
-         wifi_interface_handle iface, char *buffer, int buffer_size);\r
- \r
- \r
- /* api to collect driver records */\r
- wifi_error wifi_get_ringdata(wifi_request_id id,\r
-         wifi_interface_handle iface, wifi_ring_buffer_id ring_id);\r
+         wifi_interface_handle iface, char **buffer, int *buffer_size);\r
  \r
 -\r
  /* Feature set */\r
- #define WIFI_LOGGER_MEMORY_DUMP_SUPPORTED 1\r
- #define WIFI_LOGGER_PER_PACKET_TX_RX_STATUS_SUPPORTED 2\r
- \r
- wifi_error wifi_get_logger_supported_feature_set(wifi_interface_handle handle, unsigned int *support);\r
+ enum {\r
+     WIFI_LOGGER_MEMORY_DUMP_SUPPORTED = (1 << (0)), // Memory dump of FW\r
+     WIFI_LOGGER_PER_PACKET_TX_RX_STATUS_SUPPORTED = (1 << (1)), // PKT status\r
+     WIFI_LOGGER_CONNECT_EVENT_SUPPORTED = (1 << (2)), // Connectivity event\r
+     WIFI_LOGGER_POWER_EVENT_SUPPORTED = (1 << (3)), // POWER of Driver\r
+     WIFI_LOGGER_WAKE_LOCK_SUPPORTED = (1 << (4)), // WAKE LOCK of Driver\r
+     WIFI_LOGGER_VERBOSE_SUPPORTED = (1 << (5)), // verbose log of FW\r
+     WIFI_LOGGER_WATCHDOG_TIMER_SUPPORTED = (1 << (6)) // monitor the health of FW\r
+ };\r
+ wifi_error wifi_get_logger_supported_feature_set(wifi_request_id id, wifi_interface_handle iface, unsigned int *support);\r
  \r
  \r
  #ifdef __cplusplus\r