From 996458b76c944f78eee26d7bd8cb4d39303b9119 Mon Sep 17 00:00:00 2001
From: Deepanshu Gupta <deepanshu@google.com>
Date: Fri, 29 May 2015 17:00:34 -0700
Subject: Fix ParserFactory not initialized error.

Bug: http://b.android.com/175129
Change-Id: I2111673767e0f62ee910560022b559a177d55abd
---
 .../bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools/layoutlib/bridge/src')

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
index f3a0d58..de77d57 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
@@ -99,9 +99,6 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso
             return result;
         }
 
-        // setup the ParserFactory
-        ParserFactory.setParserFactory(mParams.getLayoutlibCallback().getParserFactory());
-
         HardwareConfig hardwareConfig = mParams.getHardwareConfig();
 
         // setup the display Metrics.
@@ -230,6 +227,9 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso
      * The counterpart is {@link #tearDown()}.
      */
     private void setUp() {
+        // setup the ParserFactory
+        ParserFactory.setParserFactory(mParams.getLayoutlibCallback().getParserFactory());
+
         // make sure the Resources object references the context (and other objects) for this
         // scene
         mContext.initResources();
-- 
cgit v1.1