commit c77916b218e67fe0c5a610f4e17a9c56e14727be
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 08 22:33:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 08 22:33:39 2019 +0000
tree 4b5d3a68f9338f45bcf38ce6d10fe33a6ed372a2
parent 99e5260f39bdc92cda46b435eff1974c8c44fa98
parent 83306047afc48e506d6749de66b32b54bc9482ff

Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev

tests/tests/net/jni/NativeDnsJni.c

diff --git a/tests/tests/net/jni/NativeDnsJni.c b/tests/tests/net/jni/NativeDnsJni.c
index 4eb3c7a..1df9169 100644
--- a/tests/tests/net/jni/NativeDnsJni.c
+++ b/tests/tests/net/jni/NativeDnsJni.c
@@ -120,8 +120,8 @@
             gai_strerror(res));
         return JNI_FALSE;
     }
-    if (strstr(buf, "google.com") == NULL) {
-        ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com: %s",
+    if (strstr(buf, "google.com") == NULL && strstr(buf, "dns.google") == NULL) {
+        ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com or dns.google: %s",
             GoogleDNSIpV4Address, buf);
         return JNI_FALSE;
     }
@@ -133,8 +133,9 @@
             res, gai_strerror(res));
         return JNI_FALSE;
     }
-    if (strstr(buf, "google.com") == NULL) {
-        ALOGD("getnameinfo(%s) didn't return google.com: %s", GoogleDNSIpV6Address2, buf);
+    if (strstr(buf, "google.com") == NULL && strstr(buf, "dns.google") == NULL) {
+        ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com or dns.google: %s",
+            GoogleDNSIpV6Address2, buf);
         return JNI_FALSE;
     }