From f6682b031742df794f95a3955db60595cb459b2a Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Wed, 1 Sep 2010 09:12:38 -0700
Subject: [PATCH] Fix NPE in toString

bug:2965739
Change-Id: Ic3f274cba8ac668d86a8f69f1b2b738d348b3977
---
 core/java/android/net/ProxyProperties.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/java/android/net/ProxyProperties.java b/core/java/android/net/ProxyProperties.java
index 17d0ec050fd87..bce7ec015a848 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();
     }