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

Commit 95999bda authored by Erik Kline's avatar Erik Kline
Browse files

Remove the last of the ResolvUtil uses 

This is the completion of cleanup work started in aosp/674269.
Consequently, also remove ResolvUtil.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - presubmit
Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 78548486
Change-Id: I980f8a9b67f3f06f2d97a60f8e58e92c36316d40
parent 2a10846e

packages/CarrierDefaultApp/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ LOCAL_PACKAGE_NAME := CarrierDefaultApp 
LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform



LOCAL_STATIC_JAVA_LIBRARIES := services.net



include $(BUILD_PACKAGE)



# This finds and builds the test apk as well, so a single make does both.

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java

+3 −5
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.net.NetworkRequest; 
import android.net.Proxy;

import android.net.TrafficStats;

import android.net.Uri;

import android.net.dns.ResolvUtil;

import android.net.http.SslError;

import android.os.Bundle;

import android.telephony.CarrierConfigManager;
@@ -159,9 +158,9 @@ public class CaptivePortalLoginActivity extends Activity { 


    private void setNetwork(Network network) {

        if (network != null) {

            network = network.getPrivateDnsBypassingCopy();

            mCm.bindProcessToNetwork(network);

            mCm.setProcessDefaultNetworkForHostResolution(

                    ResolvUtil.getNetworkWithUseLocalNameserversFlag(network));

            mCm.setProcessDefaultNetworkForHostResolution(network);

        }

        mNetwork = network;

    }
@@ -242,7 +241,6 @@ public class CaptivePortalLoginActivity extends Activity { 
    private void testForCaptivePortal() {

        mTestingThread = new Thread(new Runnable() {

            public void run() {

                final Network network = ResolvUtil.makeNetworkWithPrivateDnsBypass(mNetwork);

                // Give time for captive portal to open.

                try {

                    Thread.sleep(1000);
@@ -253,7 +251,7 @@ public class CaptivePortalLoginActivity extends Activity { 
                int httpResponseCode = 500;

                int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_PROBE);

                try {

                    urlConnection = (HttpURLConnection) network.openConnection(

                    urlConnection = (HttpURLConnection) mNetwork.openConnection(

                            new URL(mCm.getCaptivePortalServerUrl()));

                    urlConnection.setInstanceFollowRedirects(false);

                    urlConnection.setConnectTimeout(SOCKET_TIMEOUT_MS);

services/net/java/android/net/dns/ResolvUtil.java

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.net.dns;



import static android.system.OsConstants.AI_ADDRCONFIG;



import android.net.Network;

import android.net.NetworkUtils;

import android.system.GaiException;

import android.system.OsConstants;

import android.system.StructAddrinfo;



import libcore.io.Libcore;



import java.net.InetAddress;

import java.net.UnknownHostException;





/**

 * DNS resolution utility class.

 *

 * @hide

 */

public class ResolvUtil {

    // Non-portable DNS resolution flag.

    private static final long NETID_USE_LOCAL_NAMESERVERS = 0x80000000L;



    private ResolvUtil() {}



    public static InetAddress[] blockingResolveAllLocally(Network network, String name)

            throws UnknownHostException {

        // Use AI_ADDRCONFIG by default

        return blockingResolveAllLocally(network, name, AI_ADDRCONFIG);

    }



    public static InetAddress[] blockingResolveAllLocally(

            Network network, String name, int aiFlags) throws UnknownHostException  {

        final StructAddrinfo hints = new StructAddrinfo();

        hints.ai_flags = aiFlags;

        // Other hints identical to the default Inet6AddressImpl implementation

        hints.ai_family = OsConstants.AF_UNSPEC;

        hints.ai_socktype = OsConstants.SOCK_STREAM;



        final Network networkForResolv = getNetworkWithUseLocalNameserversFlag(network);



        try {

            return Libcore.os.android_getaddrinfo(name, hints, (int) networkForResolv.netId);

        } catch (GaiException gai) {

            gai.rethrowAsUnknownHostException(name + ": TLS-bypass resolution failed");

            return null;  // keep compiler quiet

        }

    }



    public static Network getNetworkWithUseLocalNameserversFlag(Network network) {

        final long netidForResolv = NETID_USE_LOCAL_NAMESERVERS | (long) network.netId;

        return new Network((int) netidForResolv);

    }



    public static Network makeNetworkWithPrivateDnsBypass(Network network) {

        return new Network(network) {

            @Override

            public InetAddress[] getAllByName(String host) throws UnknownHostException {

                return blockingResolveAllLocally(network, host);

            }

        };

    }

}