am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] (f20c9c66) · Commits · e / os / android_frameworks_base

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

+15 −6

Original line number	Diff line number	Diff line
		@@ -247,11 +247,16 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso
		* The counterpart is {@link #setUp()}.
		*/
		private void tearDown() {
		// The context may be null, if there was an error during init().
		if (mContext != null) {
		// Make sure to remove static references, otherwise we could not unload the lib
		mContext.disposeResources();
		}

		if (sCurrentContext != null) {
		// quit HandlerThread created during this session.
		HandlerThread_Delegate.cleanUp(sCurrentContext);
		}

		// clear the stored ViewConfiguration since the map is per density and not per context.
		ViewConfiguration_Accessor.clearConfigurations();
		@@ -262,10 +267,14 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso
		sCurrentContext = null;

		Bridge.setLog(null);
		if (mContext != null) {
		mContext.getRenderResources().setFrameworkResourceIdProvider(null);
		mContext.getRenderResources().setLogger(null);
		}

		mContext = null;
		}

		public static BridgeContext getCurrentContext() {
		return sCurrentContext;
		}