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

Merge "Use system API to obtain IDnsResolver IBinder"

Browse Source
This commit is contained in:
Paul Hu
2020-12-30 06:35:05 +00:00
committed by Gerrit Code Review
parent 67f888738b a10d821111
commit 68b68900aa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -83,6 +83,7 @@ import android.net.ConnectivityDiagnosticsManager.ConnectivityReport;
import android.net.ConnectivityDiagnosticsManager.DataStallReport; import android.net.ConnectivityDiagnosticsManager.DataStallReport;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.DataStallReportParcelable; import android.net.DataStallReportParcelable;
import android.net.DnsResolverServiceManager;
import android.net.ICaptivePortal; import android.net.ICaptivePortal;
import android.net.IConnectivityDiagnosticsCallback; import android.net.IConnectivityDiagnosticsCallback;
import android.net.IConnectivityManager; import android.net.IConnectivityManager;
@@ -571,9 +572,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
return sMagicDecoderRing.get(what, Integer.toString(what)); return sMagicDecoderRing.get(what, Integer.toString(what));
} }
private static IDnsResolver getDnsResolver() { private static IDnsResolver getDnsResolver(Context context) {
return IDnsResolver.Stub return IDnsResolver.Stub.asInterface(DnsResolverServiceManager.getService(context));
.asInterface(ServiceManager.getService("dnsresolver"));
} }
/** Handler thread used for all of the handlers below. */ /** Handler thread used for all of the handlers below. */
@@ -946,7 +946,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
public ConnectivityService(Context context, INetworkManagementService netManager, public ConnectivityService(Context context, INetworkManagementService netManager,
INetworkStatsService statsService, INetworkPolicyManager policyManager) { INetworkStatsService statsService, INetworkPolicyManager policyManager) {
this(context, netManager, statsService, policyManager, getDnsResolver(), this(context, netManager, statsService, policyManager, getDnsResolver(context),
new IpConnectivityLog(), NetdService.getInstance(), new Dependencies()); new IpConnectivityLog(), NetdService.getInstance(), new Dependencies());
} }