summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-09 13:47:07 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-07-09 13:47:07 -0700
commit1a3ef96b34e3a34d718ed80a107b70bbc3cbfb66 (patch)
tree1d1a61a51521d9a7f80044aa4bab9b72b9b4c1d2 /tests
parent368df9418226a1f70b664d820d89d0e089e6b52d (diff)
parente57ff0e1db46559699e4fadfbe9abe67ef9472fe (diff)
downloadframeworks_base-1a3ef96b34e3a34d718ed80a107b70bbc3cbfb66.zip
frameworks_base-1a3ef96b34e3a34d718ed80a107b70bbc3cbfb66.tar.gz
frameworks_base-1a3ef96b34e3a34d718ed80a107b70bbc3cbfb66.tar.bz2
am e57ff0e1: Merge change 6652 into donut
Merge commit 'e57ff0e1db46559699e4fadfbe9abe67ef9472fe' * commit 'e57ff0e1db46559699e4fadfbe9abe67ef9472fe': Call clearCache on WebView before collecting memory information.
Diffstat (limited to 'tests')
-rw-r--r--tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java1
-rw-r--r--tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java4
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
index cbcac6c..39bbf16 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
@@ -72,6 +72,7 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
// Run tests
runTestAndWaitUntilDone(activity, runner.mTestPath, runner.mTimeoutInMillis);
+ activity.clearCache();
dumpMemoryInfo();
// Kill activity
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
index 1980ec2..34c6e0b 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -90,6 +90,10 @@ public class TestShellActivity extends Activity implements LayoutTestController
}
}
+ public void clearCache() {
+ mWebView.clearCache(true);
+ }
+
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);