am "fix wifi logger API"

Merge commit 8fe39d1 from partner/m-wireless-wifi-dev
8fe39d1 fix wifi logger API

Change-Id: I0078c313dfd7f900bd36ecb4af8b42b880cdbd9c

diff --cc include/hardware_legacy/gscan.h
index 1db6424,252ee83..3cc8050
--- 1/include/hardware_legacy/gscan.h
--- 2/include/hardware_legacy/gscan.h
+++ b/include/hardware_legacy/gscan.h
@@@ -397,13 -405,14 +400,13 @@@ typedef struct 
                          // it with other roam candidate
  } wifi_bssid_preference;
  
 -wifi_error wifi_set_lazy_roam(wifi_request_id id, wifi_interface_handle iface,
 +wifi_error wifi_set_bssid_preference(wifi_request_id id, wifi_interface_handle iface,
                                      int num_bssid, wifi_bssid_preference *prefs);
  
 -
  typedef struct {
-     int max_number_epno_networks_by_crc32; //max number of epno entries if crc32 is specified
-     int max_number_epno_networks_by_ssid;  //max number of epno entries if ssid is specified
-     int max_number_of_white_losted_ssid;   //max number of white listed SSIDs, M target is 2 to 4 */
+     int max_number_epno_networks;           // max number of epno entries, M target is 64
+     int max_number_of_white_listed_ssid;    // max number of white listed SSIDs, M target is 2 to 4
+     int max_number_of_hotlist_ssid;         // max number of hotlist SSIDs, M target is 4
  } wifi_roam_autojoin_offload_capabilities;
  
  wifi_error wifi_get_roam_autojoin_offload_capabilities(wifi_interface_handle handle,

diff --cc include/hardware_legacy/wifi_logger.h
Simple merge