Merge "call clearCache from UI thread"
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
index ee5bb5d..d883a32 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
@@ -100,7 +100,7 @@
throw new RuntimeException("No test specified");
}
- TestShellActivity activity = (TestShellActivity) getActivity();
+ final TestShellActivity activity = (TestShellActivity) getActivity();
Log.v(LOGTAG, "About to run tests, calling gc first...");
freeMem();
@@ -109,7 +109,13 @@
runTestAndWaitUntilDone(activity, runner.mTestPath, runner.mTimeoutInMillis,
runner.mGetDrawTime, runner.mSaveImagePath);
- activity.clearCache();
+ getInstrumentation().runOnMainSync(new Runnable() {
+
+ @Override
+ public void run() {
+ activity.clearCache();
+ }
+ });
if (mForwardServer != null) {
mForwardServer.stop();
mForwardServer = null;