commit 08874db8ed9f81f1d0f205bbffe87f913e50bc57
author Romain Guy <romainguy@google.com> Thu Sep 27 23:40:56 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 27 23:40:56 2012 -0700
tree af6cda2d47ff3a958073f6bb6c6646eb5374b0d4
parent 97298cdcc0e699912288191c28bebe895759e75e
parent 97723b2eb415d044d8dcee6a5ee3a2a3fb607b15

Merge "Fix HierarchyViewer so it can load Contacts" into jb-mr1-dev

core/java/android/view/ViewDebug.java

diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index 1286eb9..c013d85 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -1178,10 +1178,14 @@
 
     private static void writeValue(BufferedWriter out, Object value) throws IOException {
         if (value != null) {
-            String output = value.toString().replace("\n", "\\n");
-            out.write(String.valueOf(output.length()));
-            out.write(",");
-            out.write(output);
+            String output = "[EXCEPTION]";
+            try {
+                output = value.toString().replace("\n", "\\n");
+            } finally {
+                out.write(String.valueOf(output.length()));
+                out.write(",");
+                out.write(output);
+            }
         } else {
             out.write("4,null");
         }