diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-13 16:27:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 16:27:56 -0800 |
| commit | ec9e8933effe1dcb6887f7dca1cc0d78e6107e38 (patch) | |
| tree | 5a7fcd4cbff9b2aae93d4223ffb43e3585f88869 /core/java/android | |
| parent | 84f4ad807152b6266431144425f153c48db28696 (diff) | |
| parent | 3b9244b4b4d5008daa9763a169a751975c75cc54 (diff) | |
am 3b9244b4: Merge "Fix for the invalid Global Proxy Setting"
* commit '3b9244b4b4d5008daa9763a169a751975c75cc54':
Fix for the invalid Global Proxy Setting
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/ProxyProperties.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/net/ProxyProperties.java b/core/java/android/net/ProxyProperties.java index 9c4772b90f5c..a4157c9225be 100644 --- a/core/java/android/net/ProxyProperties.java +++ b/core/java/android/net/ProxyProperties.java @@ -115,6 +115,16 @@ public class ProxyProperties implements Parcelable { return false; } + public boolean isValid() { + try { + Proxy.validate(mHost == null ? "" : mHost, mPort == 0 ? "" : Integer.toString(mPort), + mExclusionList == null ? "" : mExclusionList); + } catch (IllegalArgumentException e) { + return false; + } + return true; + } + public java.net.Proxy makeProxy() { java.net.Proxy proxy = java.net.Proxy.NO_PROXY; if (mHost != null) { |