Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE when runnin testActivity" into nyc-dev

Browse Source
This commit is contained in:
Diego Perez
2016-04-07 19:02:33 +00:00
committed by Android (Google) Code Review
parent 8cd2243d8c 8cdf61a02e
commit 2155ad8204
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
View File

@@ -639,7 +639,8 @@ public final class BridgeContext extends Context {
} }
// Add value to defaultPropsMap if needed // Add value to defaultPropsMap if needed
if (typeArrayAndPropertiesPair.getSecond() != null) { if (typeArrayAndPropertiesPair.getSecond() != null) {
Object key = getCurrentParser().getViewCookie(); BridgeXmlBlockParser parser = getCurrentParser();
Object key = parser != null ? parser.getViewCookie() : null;
if (key != null) { if (key != null) {
PropertiesMap defaultPropMap = mDefaultPropMaps.get(key); PropertiesMap defaultPropMap = mDefaultPropMaps.get(key);
if (defaultPropMap == null) { if (defaultPropMap == null) {