diff options
| author | Selim Gurun <sgurun@google.com> | 2014-05-16 19:09:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-16 19:09:10 +0000 |
| commit | 4455f54b5ba98da345c64de1614b0704022d272b (patch) | |
| tree | 7bab2d01c8b7391d074b4f9b06d52e00ddfe6157 /core | |
| parent | 20f98b05613cb08f2fa9ac08e3380d915705ddd4 (diff) | |
| parent | 178201f7ff829708b6788e6ec6d762a8a3a1fd92 (diff) | |
| download | frameworks_base-4455f54b5ba98da345c64de1614b0704022d272b.zip frameworks_base-4455f54b5ba98da345c64de1614b0704022d272b.tar.gz frameworks_base-4455f54b5ba98da345c64de1614b0704022d272b.tar.bz2 | |
Merge "Add a setting for data reduction proxy key"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d09bb88..d063168 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2900,6 +2900,7 @@ public final class Settings { MOVED_TO_GLOBAL.add(Settings.Global.SET_GLOBAL_HTTP_PROXY); MOVED_TO_GLOBAL.add(Settings.Global.DEFAULT_DNS_SERVER); MOVED_TO_GLOBAL.add(Settings.Global.PREFERRED_NETWORK_MODE); + MOVED_TO_GLOBAL.add(Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY); } /** @hide */ @@ -5330,6 +5331,13 @@ public final class Settings { */ public static final String USE_GOOGLE_MAIL = "use_google_mail"; + /** + * Webview Data reduction proxy key. + * @hide + */ + public static final String WEBVIEW_DATA_REDUCTION_PROXY_KEY = + "webview_data_reduction_proxy_key"; + /** * Whether Wifi display is enabled/disabled * 0=disabled. 1=enabled. |