commit d9c93c204e1d6b2b41281b0a52ad4007f3a52c9e
author Manoj <manojboopathi@google.com> Thu Oct 19 13:40:26 2017 -0700
committer manojboopathi <manojboopathi@google.com> Thu Oct 26 13:18:10 2017 -0700
tree 0107533dd5399478dfd6807389ab3b986e496774
parent 1460e99c20ba8f2b2ec050dda06f949b121ca2a8

Address STOPSHIPS in XfrmController.cpp

Removed VDBG macro and added android_log_is_debuggable to make the logs
appear only on Eng/UserDebug build.

Test: Ran all framework-net test
Bug: 64948926
Change-Id: If615e1ac6b3390d574096f50bba1678e8cf81d5a

server/XfrmController.cpp

diff --git a/server/XfrmController.cpp b/server/XfrmController.cpp
index 2721013..b31aafa 100644
--- a/server/XfrmController.cpp
+++ b/server/XfrmController.cpp
@@ -45,6 +45,7 @@
 #include "android-base/stringprintf.h"
 #include "android-base/strings.h"
 #include "android-base/unique_fd.h"
+#include <log/log_properties.h>
 #define LOG_TAG "XfrmController"
 #include "NetdConstants.h"
 #include "NetlinkCommands.h"
@@ -57,8 +58,6 @@
 #include <cutils/properties.h>
 #include <logwrap/logwrap.h>
 
-#define VDBG 1 // STOPSHIP if true
-
 using android::netdutils::Fd;
 using android::netdutils::Slice;
 using android::netdutils::Status;
@@ -120,15 +119,19 @@
 uint8_t kPadBytesArray[] = {0, 0, 0};
 void* kPadBytes = static_cast<void*>(kPadBytesArray);
 
-#if VDBG
 #define LOG_HEX(__desc16__, __buf__, __len__)                                                      \
-    do {                                                                                           \
-        logHex(__desc16__, __buf__, __len__);                                                      \
-    } while (0)
+    if (__android_log_is_debuggable()) {                                                           \
+        do {                                                                                       \
+            logHex(__desc16__, __buf__, __len__);                                                  \
+           } while (0);                                                                            \
+    }
+
 #define LOG_IOV(__iov__)                                                                           \
-    do {                                                                                           \
-        logIov(__iov__);                                                                           \
-    } while (0)
+    if (__android_log_is_debuggable()) {                                                           \
+        do {                                                                                       \
+            logIov(__iov__);                                                                       \
+           } while (0);                                                                            \
+     }
 
 void logHex(const char* desc16, const char* buf, size_t len) {
     char* printBuf = new char[len * 2 + 1 + 26]; // len->ascii, +newline, +prefix strlen
@@ -156,11 +159,6 @@
 // TODO: Need to consider a way to refer to the sSycalls instance
 inline Syscalls& getSyscallInstance() { return netdutils::sSyscalls.get(); }
 
-#else
-#define LOG_HEX(__desc16__, __buf__, __len__)
-#define LOG_IOV(__iov__, __iov_len__)
-#endif
-
 class XfrmSocketImpl : public XfrmSocket {
 private:
     static constexpr int NLMSG_DEFAULTSIZE = 8192;
@@ -237,8 +235,7 @@
         }
 
         ALOGD("Sending Netlink XFRM Message: %s", xfrmMsgTypeToString(nlMsgType));
-        if (VDBG)
-            LOG_IOV(*iovecs);
+        LOG_IOV(*iovecs);
 
         StatusOr<size_t> writeResult = getSyscallInstance().writev(mSock, *iovecs);
         if (!isOk(writeResult)) {