LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages 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
parent 2f54971c99 6b593934d3
commit dcac3aaf9f
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/ProxyProperties.java
View File

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