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

Commit b2bebe91 authored by Diego Perez's avatar Diego Perez Committed by android-build-merger
Browse files

Merge "Fix NPE when runnin testActivity" into nyc-dev am: 2155ad82 

am: d1acd13c

* commit 'd1acd13c':
  Fix NPE when runnin testActivity

Change-Id: I6265499e78d4ad3a1b7374fdfb68cf19179f7194
parents c6d81cbe d1acd13c

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