Merge "Fix broken perf tests" into oc-dev (974b5b13) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTestBase.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -311,7 +311,6 @@ public class RenderTestBase {
		sFrameworkRepo = null;
		sProjectResources = null;
		sLogger = null;
		sBridge.dispose();
		sBridge = null;

		TestUtils.gc();
		@@ -329,7 +328,6 @@ public class RenderTestBase {
		RenderSession session = sBridge.createSession(params);

		try {

		if (frameTimeNanos != -1) {
		session.setElapsedFrameTimeNanos(frameTimeNanos);
		}
		@@ -338,12 +336,14 @@ public class RenderTestBase {
		getLogger().error(session.getResult().getException(),
		session.getResult().getErrorMessage());
		}
		else {
		// Render the session with a timeout of 50s.
		Result renderResult = session.render(50000);
		if (!renderResult.isSuccess()) {
		getLogger().error(session.getResult().getException(),
		session.getResult().getErrorMessage());
		}
		}

		return RenderResult.getFromSession(session);
		} finally {