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

am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

Browse Source 
* commit '6b836cd06b1a2ebe5d31336486bb1b54e42439df':
  Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2015-08-26 20:19:32 +00:00
committed by Android Git Automerger
parent f2bf5470a3 6b836cd06b
commit bf7907bfc8
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

@@ -127,6 +127,7 @@ public final class BridgeContext extends Context {
new IdentityHashMap<Object, Map<String,String>>();
// maps for dynamically generated id representing style objects (StyleResourceValue)
@Nullable
private Map<Integer, StyleResourceValue> mDynamicIdToStyleMap;
private Map<StyleResourceValue, Integer> mStyleToDynamicIdMap;
private int mDynamicIdGenerator = 0x02030000; // Base id for R.style in custom namespace
@@ -695,7 +696,7 @@ public final class BridgeContext extends Context {
}
}
} else if (defStyleRes != 0) {
StyleResourceValue item = mDynamicIdToStyleMap.get(defStyleRes);
StyleResourceValue item = getStyleByDynamicId(defStyleRes);
if (item != null) {
defStyleValues = item;
} else {