Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56a4af2f authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Use system API to obtain IDnsResolver IBinder" am: 72b76f30 am: 54984e44 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1352dd2276585cbacb48dbe952c4f90b0e4a2e5
parents 4611b7f4 54984e44

services/core/java/com/android/server/ConnectivityService.java

+4 −4
Original line number Diff line number Diff line
@@ -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;
@@ -571,9 +572,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. */
@@ -946,7 +946,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());

    }