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

Commit 6350508e authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am:... 

Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: d8b9f9fc am: 251d6848 am: ef48aef3

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

Change-Id: I9d141616f0efb16874488489f5c382a5eb7f6048
parents 149ef2b6 ef48aef3

core/java/android/net/ProxyInfo.java

+0 −12
Original line number Diff line number Diff line
@@ -126,18 +126,6 @@ public class ProxyInfo implements Parcelable { 
        mPacFileUrl = pacFileUrl;

    }



    /**

     * Create a ProxyProperties that points at a PAC URL.

     * @hide

     */

    public ProxyInfo(String pacFileUrl) {

        mHost = LOCAL_HOST;

        mPort = LOCAL_PORT;

        mExclusionList = LOCAL_EXCL_LIST;

        mParsedExclusionList = parseExclusionList(mExclusionList);

        mPacFileUrl = Uri.parse(pacFileUrl);

    }



    /**

     * Only used in PacManager after Local Proxy is bound.

     * @hide

core/java/com/android/internal/net/VpnProfile.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; 
import android.net.Ikev2VpnProfile;

import android.net.PlatformVpnProfile;

import android.net.ProxyInfo;

import android.net.Uri;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;
@@ -287,7 +288,7 @@ public final class VpnProfile implements Cloneable, Parcelable { 
                    profile.proxy = new ProxyInfo(host, port.isEmpty() ?

                            0 : Integer.parseInt(port), exclList);

                } else if (!pacFileUrl.isEmpty()) {

                    profile.proxy = new ProxyInfo(pacFileUrl);

                    profile.proxy = new ProxyInfo(Uri.parse(pacFileUrl));

                }

            } // else profile.proxy = null

services/core/java/com/android/server/connectivity/ProxyTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class ProxyTracker { 
        if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(pacFileUrl)) {

            ProxyInfo proxyProperties;

            if (!TextUtils.isEmpty(pacFileUrl)) {

                proxyProperties = new ProxyInfo(pacFileUrl);

                proxyProperties = new ProxyInfo(Uri.parse(pacFileUrl));

            } else {

                proxyProperties = new ProxyInfo(host, port, exclList);

            }

services/core/java/com/android/server/net/IpConfigStore.java

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.net.NetworkUtils; 
import android.net.ProxyInfo;

import android.net.RouteInfo;

import android.net.StaticIpConfiguration;

import android.net.Uri;

import android.util.ArrayMap;

import android.util.Log;

import android.util.SparseArray;
@@ -372,7 +373,7 @@ public class IpConfigStore { 
                            config.httpProxy = proxyInfo;

                            break;

                        case PAC:

                            ProxyInfo proxyPacProperties = new ProxyInfo(pacFileUrl);

                            ProxyInfo proxyPacProperties = new ProxyInfo(Uri.parse(pacFileUrl));

                            config.proxySettings = proxySettings;

                            config.httpProxy = proxyPacProperties;

                            break;