From 2d9d1d129ce5b44e3be3724e403a347961f7127f Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Tue, 15 Apr 2025 16:08:34 +0900
Subject: [PATCH] Add logs for awaitPrivateDnsSetting

To help investigate flakes when calling awaitPrivateDnsSetting, add more
logs.

Bug: 253698734
Test: atest
Flag: TEST_ONLY
Change-Id: I224b2693b61003a723d1e67e970232c00bd94f84
---
 tests/cts/net/src/android/net/cts/DnsResolverTest.java     | 3 +++
 .../net/util/java/android/net/cts/util/CtsNetUtils.java    | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/cts/net/src/android/net/cts/DnsResolverTest.java b/tests/cts/net/src/android/net/cts/DnsResolverTest.java
index b66b853552..7cb28c7cd8 100644
--- a/tests/cts/net/src/android/net/cts/DnsResolverTest.java
+++ b/tests/cts/net/src/android/net/cts/DnsResolverTest.java
@@ -210,6 +210,7 @@ public class DnsResolverTest {
         // In order to test query with null network, add null as an element.
         // Test cases which query with null network will go on default network.
         testableNetworks.add(null);
+        Log.i(TAG, "Using testable networks: " + testableNetworks);
         return testableNetworks.toArray(new Network[0]);
     }
 
@@ -505,6 +506,8 @@ public class DnsResolverTest {
             final Network networkForPrivateDns =
                     (network != null) ? network : mCM.getActiveNetwork();
             assertNotNull("Can't find network to await private DNS on", networkForPrivateDns);
+            Log.i(TAG, "Waiting for private DNS setting on " + networkForPrivateDns
+                    + " (testable network: " + network + ")");
             mCtsNetUtils.awaitPrivateDnsSetting(msg + " wait private DNS setting timeout",
                     networkForPrivateDns, GOOGLE_PRIVATE_DNS_SERVER, true);
             final VerifyCancelCallback callback = new VerifyCancelCallback(msg);
diff --git a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
index 173d13f6d5..5e24452c73 100644
--- a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
+++ b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
@@ -512,12 +512,15 @@ public final class CtsNetUtils {
         final NetworkCallback callback = new NetworkCallback() {
             @Override
             public void onLinkPropertiesChanged(Network n, LinkProperties lp) {
-                Log.i(TAG, "Link properties of network " + n + " changed to " + lp);
+                Log.i(TAG,  "Waiting for the private DNS server to change to " + server + " on "
+                        + network + ": Link properties of network " + n
+                        + " changed with private DNS server " + lp.getPrivateDnsServerName()
+                        + ", full LinkProperties: " + lp);
                 if (requiresValidatedServer && lp.getValidatedPrivateDnsServers().isEmpty()) {
                     return;
                 }
-                Log.i(TAG, "Set private DNS server to " + server);
                 if (network.equals(n) && Objects.equals(server, lp.getPrivateDnsServerName())) {
+                    Log.i(TAG, "Set private DNS server to " + server + " on " + network);
                     latch.countDown();
                 }
             }