diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2010-09-01 09:12:38 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2010-09-01 10:09:40 -0700 |
| commit | f6682b031742df794f95a3955db60595cb459b2a (patch) | |
| tree | 66d3ab9efd4eefe6ef303591d38628e441f66bed /core/java/android/net/ProxyProperties.java | |
| parent | d50a6ec04ff9f58b45b6581717470722822acef4 (diff) | |
Fix NPE in toString
bug:2965739
Change-Id: Ic3f274cba8ac668d86a8f69f1b2b738d348b3977
Diffstat (limited to 'core/java/android/net/ProxyProperties.java')
| -rw-r--r-- | core/java/android/net/ProxyProperties.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/net/ProxyProperties.java b/core/java/android/net/ProxyProperties.java index 17d0ec050fd8..bce7ec015a84 100644 --- a/core/java/android/net/ProxyProperties.java +++ b/core/java/android/net/ProxyProperties.java @@ -75,8 +75,12 @@ public class ProxyProperties implements Parcelable { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append(mProxy.getHostAddress()).append(":").append(mPort) - .append(" xl=").append(mExclusionList); + if (mProxy != null) { + sb.append(mProxy.getHostAddress()).append(":").append(mPort); + if (mExclusionList != null) { + sb.append(" xl=").append(mExclusionList); + } + } return sb.toString(); } |