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

Merge "Update Andorid.bp to use DnsResolver v13" into main

Browse Source
This commit is contained in:
Mike Yu
2023-11-21 12:04:30 +00:00
committed by Gerrit Code Review
parent a3b4febfe5 d0ad17c2d1
commit faa10d066b
2 changed files with 4 additions and 2 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", "androidx.annotation_annotation",
"connectivity-net-module-utils-bpf", "connectivity-net-module-utils-bpf",
"connectivity_native_aidl_interface-lateststable-java", "connectivity_native_aidl_interface-lateststable-java",
"dnsresolver_aidl_interface-V12-java", "dnsresolver_aidl_interface-V13-java",
"modules-utils-shell-command-handler", "modules-utils-shell-command-handler",
"net-utils-device-common", "net-utils-device-common",
"net-utils-device-common-ip", "net-utils-device-common-ip",

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

@@ -140,7 +140,8 @@ public class DnsManagerTest {
assertResolverOptionsEquals(actual.resolverOptions, expected.resolverOptions); assertResolverOptionsEquals(actual.resolverOptions, expected.resolverOptions);
assertContainsExactly(actual.transportTypes, expected.transportTypes); assertContainsExactly(actual.transportTypes, expected.transportTypes);
assertEquals(actual.meteredNetwork, expected.meteredNetwork); assertEquals(actual.meteredNetwork, expected.meteredNetwork);
assertFieldCountEquals(17, ResolverParamsParcel.class); assertEquals(actual.dohParams, expected.dohParams);
assertFieldCountEquals(18, ResolverParamsParcel.class);
} }
@Before @Before
@@ -381,6 +382,7 @@ public class DnsManagerTest {
expectedParams.transportTypes = TEST_TRANSPORT_TYPES; expectedParams.transportTypes = TEST_TRANSPORT_TYPES;
expectedParams.resolverOptions = null; expectedParams.resolverOptions = null;
expectedParams.meteredNetwork = true; expectedParams.meteredNetwork = true;
expectedParams.dohParams = null;
assertResolverParamsEquals(actualParams, expectedParams); assertResolverParamsEquals(actualParams, expectedParams);
} }