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

* commit 'c0fd131642f21eabec570147cf9f4116c900e8a0':
  Fix ParserFactory not initialized error. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2015-08-26 20:19:39 +00:00
committed by Android Git Automerger

View File

@@ -99,9 +99,6 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso
return result; return result;
} }
// setup the ParserFactory
ParserFactory.setParserFactory(mParams.getLayoutlibCallback().getParserFactory());
HardwareConfig hardwareConfig = mParams.getHardwareConfig(); HardwareConfig hardwareConfig = mParams.getHardwareConfig();
// setup the display Metrics. // setup the display Metrics.
@@ -230,6 +227,9 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso
* The counterpart is {@link #tearDown()}. * The counterpart is {@link #tearDown()}.
*/ */
private void setUp() { private void setUp() {
// setup the ParserFactory
ParserFactory.setParserFactory(mParams.getLayoutlibCallback().getParserFactory());
// make sure the Resources object references the context (and other objects) for this // make sure the Resources object references the context (and other objects) for this
// scene // scene
mContext.initResources(); mContext.initResources();