commit c0fd131642f21eabec570147cf9f4116c900e8a0
author Deepanshu Gupta <deepanshu@google.com> Wed Aug 26 05:55:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 26 05:55:47 2015 +0000
tree 6476fe8f5365d68ff83128354fed9a48efdb00a4
parent 6b836cd06b1a2ebe5d31336486bb1b54e42439df
parent e5fa12ad781c1759e0ff94dbc649be0e14844306

am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

* commit 'e5fa12ad781c1759e0ff94dbc649be0e14844306':
  Fix ParserFactory not initialized error. [DO NOT MERGE]

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java

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 @@
             return result;
         }
 
-        // setup the ParserFactory
-        ParserFactory.setParserFactory(mParams.getLayoutlibCallback().getParserFactory());
-
         HardwareConfig hardwareConfig = mParams.getHardwareConfig();
 
         // setup the display Metrics.
@@ -230,6 +227,9 @@
      * 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();