diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-14 10:06:43 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-02-14 10:06:49 -0800 |
| commit | 9090a7a2fdf69d6443334dc08934a120f1cad33e (patch) | |
| tree | 3df2813b1eadf3adb5991d2cc3c5821405807e88 /tests | |
| parent | 788efcf8efc24422eac2d458526bd0c0f5a0558a (diff) | |
| parent | e3a01395aec4d6ad07ddf22031eb6acb58e468bc (diff) | |
| download | frameworks_base-9090a7a2fdf69d6443334dc08934a120f1cad33e.zip frameworks_base-9090a7a2fdf69d6443334dc08934a120f1cad33e.tar.gz frameworks_base-9090a7a2fdf69d6443334dc08934a120f1cad33e.tar.bz2 | |
Merge from master
Change-Id: I72b13c6443acdfb1b9ad477942f32a925fde5c61
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index 895963a..83c9c3d 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -903,9 +903,6 @@ public class TestShellActivity extends Activity implements LayoutTestController settings.setWorkersEnabled(false); settings.setXSSAuditorEnabled(false); settings.setPageCacheCapacity(0); - // 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("use_minimal_memory", "false"); } |