Wifi-HAL: remove some calls to ALOGD

Originally part of
https://partner-android-review.googlesource.com/#/c/558740

BUG=27698661
BUG=27835354
TEST=compile

Change-Id: I4bc744370131af1058cbbb634f92579ed1b8283f

9 files changed, 2 insertions, 59 deletions

diff --git a/qcwcn/wifi_hal/common.cpp b/qcwcn/wifi_hal/common.cpp
index bc7f57f..1dc8436 100644
--- a/qcwcn/wifi_hal/common.cpp
+++ b/qcwcn/wifi_hal/common.cpp
@@ -191,8 +191,6 @@ wifi_error wifi_register_cmd(wifi_handle handle, int id, WifiCommand *cmd)
 {
     hal_info *info = (hal_info *)handle;
 
-    ALOGD("registering command %d", id);
-
     if (info->num_cmd < info->alloc_cmd) {
         info->cmd[info->num_cmd].id   = id;
         info->cmd[info->num_cmd].cmd  = cmd;
@@ -208,8 +206,6 @@ WifiCommand *wifi_unregister_cmd(wifi_handle handle, int id)
 {
     hal_info *info = (hal_info *)handle;
 
-    ALOGD("un-registering command %d", id);
-
     for (int i = 0; i < info->num_cmd; i++) {
         if (info->cmd[i].id == id) {
             WifiCommand *cmd = info->cmd[i].cmd;
diff --git a/qcwcn/wifi_hal/cpp_bindings.cpp b/qcwcn/wifi_hal/cpp_bindings.cpp
index 7941c65..4f28254 100644
--- a/qcwcn/wifi_hal/cpp_bindings.cpp
+++ b/qcwcn/wifi_hal/cpp_bindings.cpp
@@ -498,8 +498,6 @@ void WifiEvent::log() {
 
     byte *data = (byte *)genlmsg_attrdata(mHeader, 0);
     int len = genlmsg_attrlen(mHeader, 0);
-    ALOGD("cmd = %s, len = %d", get_cmdString(), len);
-    ALOGD("vendor_id = %04x, vendor_subcmd = %d", get_vendor_id(), get_vendor_subcmd());
 
     for (int i = 0; i < len; i += 16) {
         char line[81];
@@ -526,16 +524,8 @@ void WifiEvent::log() {
             }
         }
 
-        ALOGD("%s", line);
     }
 
-    for (unsigned i = 0; i < NL80211_ATTR_MAX_INTERNAL; i++) {
-        if (mAttributes[i] != NULL) {
-            ALOGD("found attribute %s", attributeToString(i));
-        }
-    }
-
-    ALOGD("-- End of message --");
 }
 
 const char *WifiEvent::get_cmdString() {
@@ -640,8 +630,6 @@ out:
 
 int WifiCommand::requestEvent(int cmd) {
 
-    ALOGD("requesting event %d", cmd);
-
     int res = wifi_register_handler(wifiHandle(), cmd, event_handler, this);
     if (res < 0) {
         return res;
@@ -651,13 +639,10 @@ int WifiCommand::requestEvent(int cmd) {
     if (res < 0)
         goto out;
 
-    ALOGD("waiting for response %d", cmd);
-
     res = nl_send_auto_complete(mInfo->cmd_sock, mMsg.getMessage());    /* send message */
     if (res < 0)
         goto out;
 
-    ALOGD("waiting for event %d", cmd);
     res = mCondition.wait();
     if (res < 0)
         goto out;
@@ -861,7 +846,6 @@ out:
 
 int WifiVendorCommand::requestResponse()
 {
-    ALOGD("%s: request a response", __FUNCTION__);
     return WifiCommand::requestResponse(mMsg);
 }
 
diff --git a/qcwcn/wifi_hal/cpp_bindings.h b/qcwcn/wifi_hal/cpp_bindings.h
index 419110b..a7b9a5a 100644
--- a/qcwcn/wifi_hal/cpp_bindings.h
+++ b/qcwcn/wifi_hal/cpp_bindings.h
@@ -317,7 +317,6 @@ public:
 
     virtual int create() {
         /* by default there is no way to cancel */
-        ALOGD("WifiCommand %p can't be created", this);
         return WIFI_ERROR_NOT_SUPPORTED;
     }
 
diff --git a/qcwcn/wifi_hal/gscan.cpp b/qcwcn/wifi_hal/gscan.cpp
index 197e770..3cc5141 100644
--- a/qcwcn/wifi_hal/gscan.cpp
+++ b/qcwcn/wifi_hal/gscan.cpp
@@ -741,7 +741,6 @@ wifi_error wifi_set_bssid_hotlist(wifi_request_id id,
         }
         event_handlers->gScanSetBssidHotlistCmdEventHandler =
             gScanSetBssidHotlistCmdEventHandler;
-        ALOGD("%s: Handler object was created for HOTLIST_AP_FOUND.", __FUNCTION__);
     } else {
         gScanSetBssidHotlistCmdEventHandler->setCallbackHandler(callbackHandler);
     }
@@ -1028,8 +1027,6 @@ wifi_error wifi_set_significant_change_handler(wifi_request_id id,
         }
         event_handlers->gScanSetSignificantChangeCmdEventHandler =
             gScanSetSignificantChangeCmdEventHandler;
-        ALOGD("%s: Event handler object was created for SIGNIFICANT_CHANGE.",
-            __FUNCTION__);
     } else {
         gScanSetSignificantChangeCmdEventHandler->setCallbackHandler(callbackHandler);
     }
@@ -2268,8 +2265,6 @@ wifi_error wifi_set_epno_list(wifi_request_id id,
         }
         event_handlers->gScanSetPnoListCmdEventHandler =
             gScanSetPnoListCmdEventHandler;
-        ALOGD("%s: Handler object was created for PNO_NETWORK_FOUND.",
-            __FUNCTION__);
     } else {
         gScanSetPnoListCmdEventHandler->setCallbackHandler(callbackHandler);
     }
@@ -2512,8 +2507,6 @@ wifi_error wifi_set_passpoint_list(wifi_request_id id,
         }
         event_handlers->gScanPnoSetPasspointListCmdEventHandler =
             gScanPnoSetPasspointListCmdEventHandler;
-        ALOGD("%s: Handler object was created for PNO_PASSPOINT_"
-            "NETWORK_FOUND.", __FUNCTION__);
     } else {
         gScanPnoSetPasspointListCmdEventHandler->setCallbackHandler(callbackHandler);
     }
diff --git a/qcwcn/wifi_hal/gscan_event_handler.cpp b/qcwcn/wifi_hal/gscan_event_handler.cpp
index 786faf8..019694e 100644
--- a/qcwcn/wifi_hal/gscan_event_handler.cpp
+++ b/qcwcn/wifi_hal/gscan_event_handler.cpp
@@ -77,7 +77,6 @@ GScanCommandEventHandler::GScanCommandEventHandler(wifi_handle handle, int id,
         : WifiVendorCommand(handle, id, vendor_id, subcmd)
 {
     int ret = 0;
-    ALOGD("GScanCommandEventHandler %p constructed", this);
     mRequestId = id;
     mHandler = handler;
     mSubCommandId = subcmd;
@@ -110,8 +109,6 @@ GScanCommandEventHandler::GScanCommandEventHandler(wifi_handle handle, int id,
         case QCA_NL80211_VENDOR_SUBCMD_GSCAN_START:
         {
             /* Register handlers for northbound asychronous scan events. */
-            ALOGD("%s: wait for GSCAN_RESULTS_AVAILABLE, "
-                "FULL_SCAN_RESULT, and SCAN EVENT events. \n", __FUNCTION__);
             ret = registerVendorHandler(mVendor_id,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_SCAN_RESULTS_AVAILABLE) ||
                   registerVendorHandler(mVendor_id,
@@ -174,14 +171,11 @@ GScanCommandEventHandler::GScanCommandEventHandler(wifi_handle handle, int id,
 
 GScanCommandEventHandler::~GScanCommandEventHandler()
 {
-    ALOGD("GScanCommandEventHandler %p destructor", this);
     switch(mSubCommandId)
     {
         case QCA_NL80211_VENDOR_SUBCMD_GSCAN_START:
         {
             /* Unregister event handlers. */
-            ALOGD("%s: Unregister handlers for GSCAN_RESULTS_AVAILABLE, "
-            "FULL_SCAN_RESULT, and SCAN EVENT events. \n", __FUNCTION__);
             unregisterVendorHandler(mVendor_id,
                     QCA_NL80211_VENDOR_SUBCMD_GSCAN_SCAN_RESULTS_AVAILABLE);
             unregisterVendorHandler(mVendor_id,
@@ -911,7 +905,6 @@ wifi_error GScanCommandEventHandler::gscan_parse_pno_network_results(
     struct nlattr *scanResultsInfo;
     int rem = 0;
     u32 len = 0;
-    ALOGD("gscan_parse_pno_network_results: starting counter: %d", i);
 
     for (scanResultsInfo = (struct nlattr *) nla_data(tb_vendor[
             QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_LIST]),
@@ -1387,9 +1380,6 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             u32 numResults = 0;
             u32 startingIndex, sizeOfObtainedResults;
 
-            ALOGD("Event QCA_NL80211_VENDOR_SUBCMD_GSCAN_HOTLIST_AP_FOUND "
-                "received.");
-
             id = nla_get_u32(
                     tbVendor[QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID]
                     );
@@ -1493,9 +1483,6 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             u32 numResults = 0;
             u32 startingIndex, sizeOfObtainedResults;
 
-            ALOGD("Event QCA_NL80211_VENDOR_SUBCMD_GSCAN_HOTLIST_AP_LOST "
-                "received.");
-
             id = nla_get_u32(
                     tbVendor[QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID]
                     );
@@ -1600,9 +1587,6 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             struct nlattr *scanResultsInfo;
             int rem = 0;
 
-            ALOGD("Event QCA_NL80211_VENDOR_SUBCMD_GSCAN_SIGNIFICANT_CHANGE "
-                "received.");
-
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID])
             {
@@ -1812,9 +1796,6 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
             u32 numResults = 0;
             u32 startingIndex, sizeOfObtainedResults;
 
-            ALOGD("Event QCA_NL80211_VENDOR_SUBCMD_PNO_NETWORK_FOUND "
-                "received.");
-
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID])
             {
@@ -1926,9 +1907,6 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event)
         {
             wifi_request_id id;
 
-            ALOGD("Event QCA_NL80211_VENDOR_SUBCMD_PNO_PASSPOINT_"
-                "NETWORK_FOUND received.");
-
             if (!tbVendor[
                 QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_REQUEST_ID])
             {
diff --git a/qcwcn/wifi_hal/ifaceeventhandler.cpp b/qcwcn/wifi_hal/ifaceeventhandler.cpp
index 1e49135..3135717 100755
--- a/qcwcn/wifi_hal/ifaceeventhandler.cpp
+++ b/qcwcn/wifi_hal/ifaceeventhandler.cpp
@@ -202,7 +202,6 @@ WifihalGeneric::WifihalGeneric(wifi_handle handle, int id, u32 vendor_id,
                                   u32 subcmd)
         : WifiVendorCommand(handle, id, vendor_id, subcmd)
 {
-    ALOGD("WifihalGeneric %p constructed", this);
     /* Initialize the member data variables here */
     mSet = 0;
     mSetSizeMax = 0;
@@ -215,7 +214,6 @@ WifihalGeneric::WifihalGeneric(wifi_handle handle, int id, u32 vendor_id,
 
 WifihalGeneric::~WifihalGeneric()
 {
-    ALOGD("WifihalGeneric %p destructor", this);
 }
 
 int WifihalGeneric::requestResponse()
diff --git a/qcwcn/wifi_hal/nan_req.cpp b/qcwcn/wifi_hal/nan_req.cpp
index 12550df..c4e43dc 100644
--- a/qcwcn/wifi_hal/nan_req.cpp
+++ b/qcwcn/wifi_hal/nan_req.cpp
@@ -1012,8 +1012,6 @@ int NanCommand::requestEvent()
     while (res > 0)
         nl_recvmsgs(mInfo->cmd_sock, cb);
 
-    ALOGD("%s: Command invoked return value:%d",__func__, res);
-
 out:
     //free the VendorData
     if (mVendorData) {
diff --git a/qcwcn/wifi_hal/wifilogger.cpp b/qcwcn/wifi_hal/wifilogger.cpp
index 6ea5eaf..2397f6d 100644
--- a/qcwcn/wifi_hal/wifilogger.cpp
+++ b/qcwcn/wifi_hal/wifilogger.cpp
@@ -1029,7 +1029,6 @@ int WifiLoggerCommand::handleResponse(WifiEvent &reply) {
                    string terminated with '\0' */
                 len = (len > mVersionLen)? (mVersionLen - 1) : len;
                 memcpy(mVersion, nla_data(tb_vendor[version]), len);
-                ALOGD("%s: WLAN version len : %d", __FUNCTION__, len);
                 ALOGD("%s: WLAN %s version : %s ", __FUNCTION__,
                       version_type, mVersion);
             }
diff --git a/qcwcn/wifi_hal/wifilogger_diag.cpp b/qcwcn/wifi_hal/wifilogger_diag.cpp
index 2d29455..e22bd0c 100644
--- a/qcwcn/wifi_hal/wifilogger_diag.cpp
+++ b/qcwcn/wifi_hal/wifilogger_diag.cpp
@@ -1955,14 +1955,12 @@ static wifi_error parse_stats_record(hal_info *info,
             status = WIFI_SUCCESS;
     } else if (pkt_stats_header->log_type == PKTLOG_TYPE_PKT_DUMP) {
         pthread_mutex_lock(&info->pkt_fate_stats_lock);
-        if (info->fate_monitoring_enabled) {
+        if (info->fate_monitoring_enabled)
             status = parse_pkt_fate_stats(info,
                                           (u8 *)(pkt_stats_header + 1),
                                           pkt_stats_header->size);
-        } else {
-            ALOGD("Packet fate monitoring is not enabled");
+        else
             status = WIFI_SUCCESS;
-        }
         pthread_mutex_unlock(&info->pkt_fate_stats_lock);
     } else {
         status = parse_tx_stats(info,