Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cdf61a0 authored by Diego Perez's avatar Diego Perez
Browse files

Fix NPE when runnin testActivity 

Change-Id: I7ac81cb286b8d5593ae7f5fedb99bfd0fda791c5
parent 8c83a85e

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

+2 −1
Original line number Diff line number Diff line
@@ -639,7 +639,8 @@ public final class BridgeContext extends Context { 
        }

        // 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) {