PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: I7e7ec3721de73523f52718665bc1763f75184a56
This commit is contained in:
Chiachang Wang
2021-03-18 03:41:16 +00:00
committed by Automerger Merge Worker
parent f60f9ec14c 3ad73342c7
commit 168298f426
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -83,6 +83,7 @@ import com.android.settingslib.wifi.AccessPoint;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -878,7 +879,8 @@ public class WifiConfigController implements TextWatcher,
result = R.string.proxy_error_invalid_port;
}
if (result == 0) {
mHttpProxy = new ProxyInfo(host, port, exclusionList);
mHttpProxy = ProxyInfo.buildDirectProxy(
host, port, Arrays.asList(exclusionList.split(",")));
} else {
return false;
}
@@ -892,7 +894,7 @@ public class WifiConfigController implements TextWatcher,
if (uri == null) {
return false;
}
mHttpProxy = new ProxyInfo(uri);
mHttpProxy = ProxyInfo.buildPacProxy(uri);
}
return true;
}

6
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -83,6 +83,7 @@ import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -860,7 +861,8 @@ public class WifiConfigController2 implements TextWatcher,
result = R.string.proxy_error_invalid_port;
}
if (result == 0) {
mHttpProxy = new ProxyInfo(host, port, exclusionList);
mHttpProxy = ProxyInfo.buildDirectProxy(
host, port, Arrays.asList(exclusionList.split(",")));
} else {
return false;
}
@@ -874,7 +876,7 @@ public class WifiConfigController2 implements TextWatcher,
if (uri == null) {
return false;
}
mHttpProxy = new ProxyInfo(uri);
mHttpProxy = ProxyInfo.buildPacProxy(uri);
}
return true;
}