From 25913465464270f9332065cb31d0ac0a348edab1 Mon Sep 17 00:00:00 2001 From: Diego Perez Date: Mon, 7 Mar 2016 14:57:48 +0000 Subject: [PATCH] DO NOT MERGE: Initialize layoutlib variables before using them Change-Id: I0d2059423b46f5eb9eb50eb226cbe9a15e57fe02 --- .../src/android/content/res/Resources_Delegate.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/layoutlib/bridge/src/android/content/res/Resources_Delegate.java b/tools/layoutlib/bridge/src/android/content/res/Resources_Delegate.java index faf79aba82986..6e8e42ff1073e 100644 --- a/tools/layoutlib/bridge/src/android/content/res/Resources_Delegate.java +++ b/tools/layoutlib/bridge/src/android/content/res/Resources_Delegate.java @@ -89,6 +89,12 @@ public class Resources_Delegate { // first get the String related to this id in the framework Pair resourceInfo = Bridge.resolveResourceId(id); + // Set the layoutlib callback and context for resources + if (resources != Resources.mSystem && resources.mLayoutlibCallback == null) { + resources.mLayoutlibCallback = Resources.mSystem.mLayoutlibCallback; + resources.mContext = Resources.mSystem.mContext; + } + if (resourceInfo != null) { platformResFlag_out[0] = true; String attributeName = resourceInfo.getSecond(); @@ -98,12 +104,6 @@ public class Resources_Delegate { resourceInfo.getFirst(), attributeName)); } - // Set the layoutlib callback and context for resources - if (resources != Resources.mSystem && resources.mLayoutlibCallback == null) { - resources.mLayoutlibCallback = Resources.mSystem.mLayoutlibCallback; - resources.mContext = Resources.mSystem.mContext; - } - // didn't find a match in the framework? look in the project. if (resources.mLayoutlibCallback != null) { resourceInfo = resources.mLayoutlibCallback.resolveResourceId(id);