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: 28ced6a6ca am: 251d68487e am: b841abe371

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

Change-Id: I9d141616f0efb16874488489f5c382a5eb7f6048
This commit is contained in:
Aaron Huang
2020-07-17 06:18:09 +00:00
committed by Automerger Merge Worker
parent ef3cbbc2c9 b841abe371
commit 8bb88d4126
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/net/IpConfigStore.java
View File

@@ -24,6 +24,7 @@ import android.net.NetworkUtils;
import android.net.ProxyInfo; import android.net.ProxyInfo;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.StaticIpConfiguration; import android.net.StaticIpConfiguration;
import android.net.Uri;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
@@ -372,7 +373,7 @@ public class IpConfigStore {
config.httpProxy = proxyInfo; config.httpProxy = proxyInfo;
break; break;
case PAC: case PAC:
ProxyInfo proxyPacProperties = new ProxyInfo(pacFileUrl); ProxyInfo proxyPacProperties = new ProxyInfo(Uri.parse(pacFileUrl));
config.proxySettings = proxySettings; config.proxySettings = proxySettings;
config.httpProxy = proxyPacProperties; config.httpProxy = proxyPacProperties;
break; break;