Merge "Added check for mText property in getText()"

1 files changed, 5 insertions, 1 deletions

diff --git a/chimpchat/src/com/android/chimpchat/hierarchyviewer/HierarchyViewer.java b/chimpchat/src/com/android/chimpchat/hierarchyviewer/HierarchyViewer.java
index 6ad98ad..285d922 100644
--- a/chimpchat/src/com/android/chimpchat/hierarchyviewer/HierarchyViewer.java
+++ b/chimpchat/src/com/android/chimpchat/hierarchyviewer/HierarchyViewer.java
@@ -170,7 +170,11 @@ public class HierarchyViewer {
         }
         ViewNode.Property textProperty = node.namedProperties.get("text:mText");
         if (textProperty == null) {
-            throw new RuntimeException("No text property on node");
+            // give it another chance, ICS ViewServer returns mText
+            textProperty = node.namedProperties.get("mText");
+            if (textProperty == null) {
+                throw new RuntimeException("No text property on node");
+            }
         }
         return textProperty.value;
     }