| commit | be91fdbc5c4f2de3a2bb574a98fdfeef44d8cdb5 | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 09 14:10:54 2009 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 09 14:10:54 2009 -0700 |
| tree | 18b0c82d452b0aca160811ea0af708a9b24ebccd | |
| parent | 16f676f4f8ae3807b5cb40086048e48cae4be3cf [diff] | |
| parent | 6c11e73f678a46b0a74c6f1936eebd51dc60f0af [diff] |
Merge change 6665 into donut * changes: Fix resources not being set correctly.
diff --git a/core/jni/android_backup_BackupDataOutput.cpp b/core/jni/android_backup_BackupDataOutput.cpp index d02590e..ce30aaa8 100644 --- a/core/jni/android_backup_BackupDataOutput.cpp +++ b/core/jni/android_backup_BackupDataOutput.cpp
@@ -70,7 +70,7 @@ int err; BackupDataWriter* writer = (BackupDataWriter*)w; - if (env->GetArrayLength(data) > size) { + if (env->GetArrayLength(data) < size) { // size mismatch return -1; }
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 @@ // 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 0d22eca..09f7cbc 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -87,6 +87,10 @@ } } + public void clearCache() { + mWebView.clearCache(true); + } + @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle);