From a10d821111da1d2166a26e30bb8057adb24ccf82 Mon Sep 17 00:00:00 2001 From: paulhu Date: Tue, 10 Nov 2020 15:32:56 +0800 Subject: [PATCH] Use system API to obtain IDnsResolver IBinder Connectivity service module is using a ServiceManager @hide API to get IDnsResolver IBinder. Replace it with DnsResolverServiceManager system API for incoming mainline. Bug: 170598012 Test: atest FrameworksNetTests Test: Manually connect and disconnect Wi-Fi/Cellular network Change-Id: I457dccd44e5adc8c4d9b3c2853323228db3a0d89 --- .../core/java/com/android/server/ConnectivityService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 4590aa2587..037fac5f63 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -83,6 +83,7 @@ import android.net.ConnectivityDiagnosticsManager.ConnectivityReport; import android.net.ConnectivityDiagnosticsManager.DataStallReport; import android.net.ConnectivityManager; import android.net.DataStallReportParcelable; +import android.net.DnsResolverServiceManager; import android.net.ICaptivePortal; import android.net.IConnectivityDiagnosticsCallback; import android.net.IConnectivityManager; @@ -577,9 +578,8 @@ public class ConnectivityService extends IConnectivityManager.Stub return sMagicDecoderRing.get(what, Integer.toString(what)); } - private static IDnsResolver getDnsResolver() { - return IDnsResolver.Stub - .asInterface(ServiceManager.getService("dnsresolver")); + private static IDnsResolver getDnsResolver(Context context) { + return IDnsResolver.Stub.asInterface(DnsResolverServiceManager.getService(context)); } /** Handler thread used for all of the handlers below. */ @@ -951,7 +951,7 @@ public class ConnectivityService extends IConnectivityManager.Stub public ConnectivityService(Context context, INetworkManagementService netManager, INetworkStatsService statsService, INetworkPolicyManager policyManager) { - this(context, netManager, statsService, policyManager, getDnsResolver(), + this(context, netManager, statsService, policyManager, getDnsResolver(context), new IpConnectivityLog(), NetdService.getInstance(), new Dependencies()); }