Merge "Use system API to obtain IDnsResolver IBinder"

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;

        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. */

    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());

    }