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

Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e am: 5463bbece5

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

Change-Id: If60a348768c507153c1a9038953b2f6c29fc8f03
This commit is contained in:
Aaron Huang
2020-07-17 06:05:38 +00:00
committed by Automerger Merge Worker
parent fbb36e7d8e 5463bbece5
commit 8f98e732a0
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/net/ProxyInfo.java
View File

@@ -126,18 +126,6 @@ public class ProxyInfo implements Parcelable {
mPacFileUrl = pacFileUrl; 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. * Only used in PacManager after Local Proxy is bound.
* @hide * @hide

2
services/core/java/com/android/server/connectivity/ProxyTracker.java
View File

@@ -163,7 +163,7 @@ public class ProxyTracker {
if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(pacFileUrl)) { if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(pacFileUrl)) {
ProxyInfo proxyProperties; ProxyInfo proxyProperties;
if (!TextUtils.isEmpty(pacFileUrl)) { if (!TextUtils.isEmpty(pacFileUrl)) {
proxyProperties = new ProxyInfo(pacFileUrl); proxyProperties = new ProxyInfo(Uri.parse(pacFileUrl));
} else { } else {
proxyProperties = new ProxyInfo(host, port, exclList); proxyProperties = new ProxyInfo(host, port, exclList);
} }