LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return detailed reason of invalid proxy settings

Browse Source 
Make Proxy.validate() return valid/invalid int code, instead of throwing
exceptions. If invalid, detailed reason code is returned (currently for
Settings UI use).

bug: 13248097
Change-Id: Ic68d03f666f1cd63667afc311de7dc370d233901
This commit is contained in:
Yuhao Zheng
2014-02-28 17:22:45 -08:00
parent f7830a6b87
commit 6b593934d3
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() { 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() {