joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Aaron Huang 2020-07-17 05:40:31 +00:00 • committed by Gerrit Code Review
commit 28ced6a6ca
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.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;