diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-09-30 10:37:01 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-09-30 10:42:21 -0700 |
| commit | dbe001b3ce8f6d1b763caee138b8b6846176b213 (patch) | |
| tree | 570ca4afaabe9bad1837efe84258cd0f284f500a | |
| parent | d745f7692520c760ff3f9ae1afe9af5b1523563c (diff) | |
| download | packages_apps_Browser-dbe001b3ce8f6d1b763caee138b8b6846176b213.zip packages_apps_Browser-dbe001b3ce8f6d1b763caee138b8b6846176b213.tar.gz packages_apps_Browser-dbe001b3ce8f6d1b763caee138b8b6846176b213.tar.bz2 | |
Switch browser back to use Gpu upload path
Change-Id: I8dbc25b6c5bdf6b8edf4ba2273b886cc000bfaff
bug:5395019
| -rw-r--r-- | res/xml/debug_preferences.xml | 2 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 4 |
2 files changed, 3 insertions, 3 deletions
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 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 class BrowserSettings implements OnSharedPreferenceChangeListener, 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() { |