Merge change 2619 into donut
* changes:
InetAddress: Stop logging DNS lookups to logcat.
diff --git a/libcore/luni/src/main/native/java_net_InetAddress.cpp b/libcore/luni/src/main/native/java_net_InetAddress.cpp
index 0eb2753..c0666d5 100644
--- a/libcore/luni/src/main/native/java_net_InetAddress.cpp
+++ b/libcore/luni/src/main/native/java_net_InetAddress.cpp
@@ -16,6 +16,8 @@
#define LOG_TAG "InetAddress"
+#define LOG_DNS 0
+
#include "JNIHelp.h"
#include "utils/Log.h"
#include "jni.h"
@@ -59,6 +61,7 @@
}
}
+#if LOG_DNS
static void logIpString(struct addrinfo* ai, const char* name)
{
char ipString[INET6_ADDRSTRLEN];
@@ -71,6 +74,11 @@
LOGE("%s: getnameinfo: %s", name, gai_strerror(result));
}
}
+#else
+static inline void logIpString(struct addrinfo* ai, const char* name)
+{
+}
+#endif
static jobjectArray getAllByNameUsingAdb(JNIEnv* env, const char* name)
{