From eb487c63017ae5cb0f3f35bf8b17c5f3bbb0f456 Mon Sep 17 00:00:00 2001 From: Hui Shu Date: Tue, 30 Sep 2014 16:52:41 -0700 Subject: [PATCH] Remove WebView DRP Setting from Developer Settings BUG: 17730990 Change-Id: Ic4fde9affb2f887329d6b3d2dbe8945959c016d8 --- core/java/android/provider/Settings.java | 15 --------------- core/java/android/webkit/WebView.java | 9 --------- 2 files changed, 24 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ec4a53e656ab1..18e6bf3911eb7 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3102,7 +3102,6 @@ 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 */ @@ -4584,13 +4583,6 @@ public final class Settings { */ public static final String ANR_SHOW_BACKGROUND = "anr_show_background"; - /** - * (Experimental). If nonzero, WebView uses data reduction proxy to save network - * bandwidth. Otherwise, WebView does not use data reduction proxy. - * @hide - */ - public static final String WEBVIEW_DATA_REDUCTION_PROXY = "webview_data_reduction_proxy"; - /** * The {@link ComponentName} string of the service to be used as the voice recognition * service. @@ -5686,13 +5678,6 @@ 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. diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 081bfdf92d125..22ee6beb6a6c5 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -251,15 +251,6 @@ public class WebView extends AbsoluteLayout implements ViewTreeObserver.OnGlobalFocusChangeListener, ViewGroup.OnHierarchyChangeListener, ViewDebug.HierarchyHandler { - /** - * Broadcast Action: Indicates the data reduction proxy setting changed. - * Sent by the settings app when user changes the data reduction proxy value. This intent will - * always stay as a hidden API. - * @hide - */ - public static final String DATA_REDUCTION_PROXY_SETTING_CHANGED = - "android.webkit.DATA_REDUCTION_PROXY_SETTING_CHANGED"; - private static final String LOGTAG = "WebView"; // Throwing an exception for incorrect thread usage if the