LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c

Browse Source 
Change-Id: I3611dbe31a1c1d42c22549e065dce570e97bada3
This commit is contained in:
Android Build Merger (Role)
2019-07-08 19:23:45 +00:00
parent 70171fe46e e6ced2f716
commit cbc0a6b066
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/cts/net/jni/NativeDnsJni.c
View File

@@ -120,8 +120,8 @@ JNIEXPORT jboolean Java_android_net_cts_DnsTest_testNativeDns(JNIEnv* env, jclas
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 @@ JNIEXPORT jboolean Java_android_net_cts_DnsTest_testNativeDns(JNIEnv* env, jclas
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;
}