commit dbe001b3ce8f6d1b763caee138b8b6846176b213
author Teng-Hui Zhu <ztenghui@google.com> Fri Sep 30 10:37:01 2011 -0700
committer Teng-Hui Zhu <ztenghui@google.com> Fri Sep 30 10:42:21 2011 -0700
tree 570ca4afaabe9bad1837efe84258cd0f284f500a
parent d745f7692520c760ff3f9ae1afe9af5b1523563c

Switch browser back to use Gpu upload path

Change-Id: I8dbc25b6c5bdf6b8edf4ba2273b886cc000bfaff

bug:5395019

res/xml/debug_preferences.xml

diff --git a/res/xml/debug_preferences.xml b/res/xml/debug_preferences.xml
index abbd07e..ed78fcb 100644
--- a/res/xml/debug_preferences.xml
+++ b/res/xml/debug_preferences.xml
@@ -41,7 +41,7 @@
 
     <CheckBoxPreference
         android:key="enable_cpu_upload_path"
-        android:defaultValue="true"
+        android:defaultValue="false"
         android:title="@string/pref_development_cpu_upload_path" />
 
     <!-- The javascript console is enabled by default when the user has

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 2c0b2ec..b9eec9c 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -677,9 +677,9 @@
 
     public boolean enableCpuUploadPath() {
         if (!isDebugEnabled()) {
-            return true;
+            return false;
         }
-        return mPrefs.getBoolean(PREF_ENABLE_CPU_UPLOAD_PATH, true);
+        return mPrefs.getBoolean(PREF_ENABLE_CPU_UPLOAD_PATH, false);
     }
 
     public boolean enableJavascriptConsole() {