Merge "Return detailed reason of invalid proxy settings"

2014-03-04 17:43:47 +00:00
parent 2f54971c99 6b593934d3
commit dcac3aaf9f
1 changed files with 3 additions and 7 deletions
--- a/core/java/android/net/ProxyProperties.java
+++ b/core/java/android/net/ProxyProperties.java
@@ -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() {