From d0ad17c2d19bba7024bf2c81a594c03fcfbb3f02 Mon Sep 17 00:00:00 2001 From: Mike Yu Date: Tue, 29 Aug 2023 01:55:28 +0000 Subject: [PATCH] Update Andorid.bp to use DnsResolver v13 Bug: 240259333 Test: atest ConnectivityCoverageTests Change-Id: I92ab5e1eef7ba1715176e3628222084067d14603 --- service/Android.bp | 2 +- .../java/com/android/server/connectivity/DnsManagerTest.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/service/Android.bp b/service/Android.bp index 76741bc677..e2dab9e15b 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -185,7 +185,7 @@ java_library { "androidx.annotation_annotation", "connectivity-net-module-utils-bpf", "connectivity_native_aidl_interface-lateststable-java", - "dnsresolver_aidl_interface-V12-java", + "dnsresolver_aidl_interface-V13-java", "modules-utils-shell-command-handler", "net-utils-device-common", "net-utils-device-common-ip", diff --git a/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java b/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java index 545ed16397..afb9abdd50 100644 --- a/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java +++ b/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java @@ -140,7 +140,8 @@ public class DnsManagerTest { assertResolverOptionsEquals(actual.resolverOptions, expected.resolverOptions); assertContainsExactly(actual.transportTypes, expected.transportTypes); assertEquals(actual.meteredNetwork, expected.meteredNetwork); - assertFieldCountEquals(17, ResolverParamsParcel.class); + assertEquals(actual.dohParams, expected.dohParams); + assertFieldCountEquals(18, ResolverParamsParcel.class); } @Before @@ -381,6 +382,7 @@ public class DnsManagerTest { expectedParams.transportTypes = TEST_TRANSPORT_TYPES; expectedParams.resolverOptions = null; expectedParams.meteredNetwork = true; + expectedParams.dohParams = null; assertResolverParamsEquals(actualParams, expectedParams); }