commit 8997bbe69bb4ebf1fbafe65aa8c736c8a452edd0
author Diego Perez <diegoperez@google.com> Thu Apr 07 18:00:17 2016 +0100
committer Diego Perez <diegoperez@google.com> Thu Apr 07 18:00:17 2016 +0100
tree 0a966bf99307603c325e5d89a03b2e6f8695876b
parent 4c4d734678606173760916ca05fec9ad809a5599

Fix NPE when runnin testActivity

Change-Id: I7ac81cb286b8d5593ae7f5fedb99bfd0fda791c5

bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

diff --git a/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index 2399b3a..89272fa 100644
--- a/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -639,7 +639,8 @@
         }
         // Add value to defaultPropsMap if needed
         if (typeArrayAndPropertiesPair.getSecond() != null) {
-            Object key = getCurrentParser().getViewCookie();
+            BridgeXmlBlockParser parser = getCurrentParser();
+            Object key = parser != null ? parser.getViewCookie() : null;
             if (key != null) {
                 PropertiesMap defaultPropMap = mDefaultPropMaps.get(key);
                 if (defaultPropMap == null) {