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 "Return detailed reason of invalid proxy settings"

Browse source
This commit is contained in:
Yuhao Zheng 2014-03-04 17:43:47 +00:00 • committed by Android (Google) Code Review
commit 58700af05a
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/java/android/net/ProxyProperties.java
View file

@ -140,13 +140,9 @@ public class ProxyProperties implements Parcelable {
public boolean isValid() {
if (!TextUtils.isEmpty(mPacFileUrl)) return true;
try {
Proxy.validate(mHost == null ? "" : mHost, mPort == 0 ? "" : Integer.toString(mPort),
mExclusionList == null ? "" : mExclusionList);
} catch (IllegalArgumentException e) {
return false;
}
return true;
return Proxy.PROXY_VALID == Proxy.validate(mHost == null ? "" : mHost,
mPort == 0 ? "" : Integer.toString(mPort),
mExclusionList == null ? "" : mExclusionList);
}
public java.net.Proxy makeProxy() {