Skip to content

Commit ae4cb17

Browse files
deepanshu-Android Git Automerger
authored andcommitted
am 76aff1f: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97': Resource resolution bug fix. [DO NOT MERGE]
2 parents d00d2ff + 76aff1f commit ae4cb17

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,7 @@ public TypedArray obtainStyledAttributes(AttributeSet set, int[] attrs,
598598

599599
if (item != null) {
600600
// item is a reference to a style entry. Search for it.
601-
item = mRenderResources.findResValue(item.getValue(),
602-
false /*forceFrameworkOnly*/);
601+
item = mRenderResources.findResValue(item.getValue(), item.isFramework());
603602

604603
if (item instanceof StyleResourceValue) {
605604
defStyleValues = (StyleResourceValue)item;

0 commit comments

Comments
 (0)