diff options
| author | Guang Zhu <guangzhu@google.com> | 2012-02-13 17:40:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-13 17:40:52 -0800 |
| commit | 3ce2772715674d7eb040090f6003e6fad85e571a (patch) | |
| tree | a29affe05f337e9d3eeb155fd7edcd0b5626f245 /tests | |
| parent | dd1977964f701efed82d1f2f40ae044c0c3a7a0d (diff) | |
| parent | 06a240e826107b32f1ebe305b0add1b72ef801ee (diff) | |
| download | frameworks_base-3ce2772715674d7eb040090f6003e6fad85e571a.zip frameworks_base-3ce2772715674d7eb040090f6003e6fad85e571a.tar.gz frameworks_base-3ce2772715674d7eb040090f6003e6fad85e571a.tar.bz2 | |
am 06a240e8: Merge "Increase transfer queue size for DRT"
* commit '06a240e826107b32f1ebe305b0add1b72ef801ee':
Increase transfer queue size for DRT
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index c0ba8cf..3febf83 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -16,18 +16,19 @@ package com.android.dumprendertree; +import com.android.browser.WebViewProperties; import com.android.dumprendertree.forwarder.ForwardService; import android.app.Activity; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; -import android.content.Intent; import android.content.DialogInterface.OnClickListener; +import android.content.Intent; import android.graphics.Bitmap; -import android.graphics.Canvas; import android.graphics.Bitmap.CompressFormat; import android.graphics.Bitmap.Config; +import android.graphics.Canvas; import android.net.http.SslError; import android.os.Bundle; import android.os.Environment; @@ -36,7 +37,6 @@ import android.os.Message; import android.util.Log; import android.view.ViewGroup; import android.view.Window; -import android.webkit.CookieManager; import android.webkit.ConsoleMessage; import android.webkit.CookieManager; import android.webkit.GeolocationPermissions; @@ -907,6 +907,7 @@ public class TestShellActivity extends Activity implements LayoutTestController // this enables cpu upload path (as opposed to gpu upload path) // and it's only meant to be a temporary workaround! settings.setProperty("enable_cpu_upload_path", "true"); + settings.setProperty(WebViewProperties.gfxUseMinimalMemory, "false"); } private WebView mWebView; @@ -977,4 +978,4 @@ public class TestShellActivity extends Activity implements LayoutTestController private boolean mIsGeolocationPermissionSet; private boolean mGeolocationPermission; private Map mPendingGeolocationPermissionCallbacks; -} +}
\ No newline at end of file |