Merge "Remove WebView fallback logic migration code." (f1764cc2) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -10433,14 +10433,6 @@ public final class Settings {
		public static final String WEBVIEW_DATA_REDUCTION_PROXY_KEY =
		"webview_data_reduction_proxy_key";

		/**
		* Whether or not the WebView fallback mechanism should be enabled.
		* 0=disabled, 1=enabled.
		* @hide
		*/
		public static final String WEBVIEW_FALLBACK_LOGIC_ENABLED =
		"webview_fallback_logic_enabled";

		/**
		* Name of the package used as WebView provider (if unset the provider is instead determined
		* by the system).

+0 −3

Original line number	Diff line number	Diff line
		@@ -1493,9 +1493,6 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY,
		GlobalSettingsProto.Webview.DATA_REDUCTION_PROXY_KEY);
		dumpSetting(s, p,
		Settings.Global.WEBVIEW_FALLBACK_LOGIC_ENABLED,
		GlobalSettingsProto.Webview.FALLBACK_LOGIC_ENABLED);
		dumpSetting(s, p,
		Settings.Global.WEBVIEW_PROVIDER,
		GlobalSettingsProto.Webview.PROVIDER);

+0 −1

Original line number	Diff line number	Diff line
		@@ -526,7 +526,6 @@ public class SettingsBackupTest {
		Settings.Global.NETWORK_ACCESS_TIMEOUT_MS,
		Settings.Global.WARNING_TEMPERATURE,
		Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY,
		Settings.Global.WEBVIEW_FALLBACK_LOGIC_ENABLED,
		Settings.Global.WEBVIEW_MULTIPROCESS,
		Settings.Global.WEBVIEW_PROVIDER,
		Settings.Global.WFC_IMS_ENABLED,

+0 −13

Original line number	Diff line number	Diff line
		@@ -196,19 +196,6 @@ public class SystemImpl implements SystemInterface {
		}
		}

		@Override
		public boolean isFallbackLogicEnabled() {
		// Note that this is enabled by default (i.e. if the setting hasn't been set).
		return Settings.Global.getInt(AppGlobals.getInitialApplication().getContentResolver(),
		Settings.Global.WEBVIEW_FALLBACK_LOGIC_ENABLED, 1) == 1;
		}

		@Override
		public void enableFallbackLogic(boolean enable) {
		Settings.Global.putInt(AppGlobals.getInitialApplication().getContentResolver(),
		Settings.Global.WEBVIEW_FALLBACK_LOGIC_ENABLED, enable ? 1 : 0);
		}

		@Override
		public void enablePackageForAllUsers(Context context, String packageName, boolean enable) {
		UserManager userManager = (UserManager)context.getSystemService(Context.USER_SERVICE);

+0 −3

Original line number	Diff line number	Diff line
		@@ -41,9 +41,6 @@ public interface SystemInterface {
		public void updateUserSetting(Context context, String newProviderName);
		public void killPackageDependents(String packageName);

		public boolean isFallbackLogicEnabled();
		public void enableFallbackLogic(boolean enable);

		public void enablePackageForAllUsers(Context context, String packageName, boolean enable);

		public boolean systemIsDebuggable();