joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add logs for awaitPrivateDnsSetting" into main

Browse source
This commit is contained in:
Treehugger Robot 2025-04-17 13:30:22 -07:00 • committed by Android (Google) Code Review
commit 6ffc2751e7
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/cts/net/src/android/net/cts/DnsResolverTest.java
View file

@ -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);

7
tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
View file

@ -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();
}
}