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

Commit 5cd795a9 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev

parents 1421583b d758e042

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

+2 −1
Original line number Diff line number Diff line
@@ -130,6 +130,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
@@ -727,7 +728,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 {