DO NOT MERGE: Initialize layoutlib variables before using them

Change-Id: I0d2059423b46f5eb9eb50eb226cbe9a15e57fe02

1 files 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 faf79aba8298..6e8e42ff1073 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<ResourceType, String> 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);