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

Pass metered information to DNS resolver

Browse source 
Dns Resolver needs to know whether a network is metered when checking if
DNS requests will be blocked by Data Saver.

Bug: 288340533
Test: atest FrameworksNetTests
Change-Id: Ia5822dc522c766c7815680003c7ba275d15ccaff
This commit is contained in:
Ken Chen 2023-10-07 07:54:22 +08:00
commit 5a35cf9086
4 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service/Android.bp
View file

@ -185,7 +185,7 @@ java_library {
"androidx.annotation_annotation",
"connectivity-net-module-utils-bpf",
"connectivity_native_aidl_interface-lateststable-java",
"dnsresolver_aidl_interface-V11-java",
"dnsresolver_aidl_interface-V12-java",
"modules-utils-shell-command-handler",
"net-utils-device-common",
"net-utils-device-common-ip",

2
service/src/com/android/server/ConnectivityService.java
View file

@ -8898,7 +8898,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// This network might have been underlying another network. Propagate its capabilities.
propagateUnderlyingNetworkCapabilities(nai.network);
if (!newNc.equalsTransportTypes(prevNc)) {
if (meteredChanged || !newNc.equalsTransportTypes(prevNc)) {
mDnsManager.updateCapabilitiesForNetwork(nai.network.getNetId(), newNc);
}

24
service/src/com/android/server/connectivity/DnsManager.java
View file

@ -326,10 +326,14 @@ public class DnsManager {
}
/**
* When creating a new network or transport types are changed in a specific network,
* capabilities are always saved to a hashMap before update dns config.
* When destroying network, the specific network will be removed from the hashMap.
* The hashMap is always accessed on the same thread.
* Update {@link NetworkCapabilities} stored in this instance.
*
* In order to ensure that the resolver has access to necessary information when other events
* occur, capabilities are always saved to a hashMap before updating the DNS configuration
* whenever a new network is created, transport types are modified, or metered capabilities are
* altered for a network. When a network is destroyed, the corresponding entry is removed from
* the hashMap. To prevent concurrency issues, the hashMap should always be accessed from the
* same thread.
*/
public void updateCapabilitiesForNetwork(int netId, @NonNull final NetworkCapabilities nc) {
mNetworkCapabilitiesMap.put(netId, nc);
@ -385,6 +389,7 @@ public class DnsManager {
: useTls ? paramsParcel.servers // Opportunistic
: new String[0]; // Off
paramsParcel.transportTypes = nc.getTransportTypes();
paramsParcel.meteredNetwork = nc.isMetered();
// Prepare to track the validation status of the DNS servers in the
// resolver config when private DNS is in opportunistic or strict mode.
if (useTls) {
@ -398,12 +403,13 @@ public class DnsManager {
}
Log.d(TAG, String.format("sendDnsConfigurationForNetwork(%d, %s, %s, %d, %d, %d, %d, "
+ "%d, %d, %s, %s)", paramsParcel.netId, Arrays.toString(paramsParcel.servers),
Arrays.toString(paramsParcel.domains), paramsParcel.sampleValiditySeconds,
paramsParcel.successThreshold, paramsParcel.minSamples,
paramsParcel.maxSamples, paramsParcel.baseTimeoutMsec,
+ "%d, %d, %s, %s, %s, %b)", paramsParcel.netId,
Arrays.toString(paramsParcel.servers), Arrays.toString(paramsParcel.domains),
paramsParcel.sampleValiditySeconds, paramsParcel.successThreshold,
paramsParcel.minSamples, paramsParcel.maxSamples, paramsParcel.baseTimeoutMsec,
paramsParcel.retryCount, paramsParcel.tlsName,
Arrays.toString(paramsParcel.tlsServers)));
Arrays.toString(paramsParcel.tlsServers),
Arrays.toString(paramsParcel.transportTypes), paramsParcel.meteredNetwork));
try {
mDnsResolver.setResolverConfiguration(paramsParcel);

4
tests/unit/java/com/android/server/connectivity/DnsManagerTest.java
View file

@ -139,7 +139,8 @@ public class DnsManagerTest {
assertEquals(actual.tlsConnectTimeoutMs, expected.tlsConnectTimeoutMs);
assertResolverOptionsEquals(actual.resolverOptions, expected.resolverOptions);
assertContainsExactly(actual.transportTypes, expected.transportTypes);
assertFieldCountEquals(16, ResolverParamsParcel.class);
assertEquals(actual.meteredNetwork, expected.meteredNetwork);
assertFieldCountEquals(17, ResolverParamsParcel.class);
}
@Before
@ -379,6 +380,7 @@ public class DnsManagerTest {
expectedParams.tlsServers = new String[]{"3.3.3.3", "4.4.4.4"};
expectedParams.transportTypes = TEST_TRANSPORT_TYPES;
expectedParams.resolverOptions = null;
expectedParams.meteredNetwork = true;
assertResolverParamsEquals(actualParams, expectedParams);
}