diff options
| author | Raj Mamadgi <rmamadgi@sta.samsung.com> | 2013-11-11 13:52:58 -0800 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-14 00:08:21 +0000 |
| commit | 92d02491aded7ca233fd52d586cc0b0bda4521cf (patch) | |
| tree | c876817adb28c781f7736ccc17d36e1c12fc7b8a /core/java/android/net/ProxyProperties.java | |
| parent | a951fa56f1855cd0337bddacc01e35868c6d66d6 (diff) | |
Fix for the invalid Global Proxy Setting
Adding validation for Global Proxy setting before it is
being set.
Proxy is validated at the boot time also to make sure
the value set is valid.
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:11598568
Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4
Diffstat (limited to 'core/java/android/net/ProxyProperties.java')
| -rw-r--r-- | core/java/android/net/ProxyProperties.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/net/ProxyProperties.java b/core/java/android/net/ProxyProperties.java index 78ac75f22c36..010e5277074c 100644 --- a/core/java/android/net/ProxyProperties.java +++ b/core/java/android/net/ProxyProperties.java @@ -139,6 +139,17 @@ public class ProxyProperties implements Parcelable { return false; } + 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; + } + public java.net.Proxy makeProxy() { java.net.Proxy proxy = java.net.Proxy.NO_PROXY; if (mHost != null) { |