diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebViewFactory.java | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index 2ee0961a6582..53abf196a699 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -28,8 +28,15 @@ import android.util.Log; * @hide */ public final class WebViewFactory { - public static final boolean DEFAULT_TO_EXPERIMENTAL_WEBVIEW = false; - public static final String WEBVIEW_EXPERIMENTAL_PROPERTY = "persist.sys.webview.exp"; + private static final boolean DEFAULT_TO_EXPERIMENTAL_WEBVIEW = false; + private static final String EXPERIMENTAL_PROPERTY_DEFAULT_OFF = "persist.sys.webview.exp"; + private static final String EXPERIMENTAL_PROPERTY_DEFAULT_ON = "persist.sys.webview.exp_on"; + + // Modify the persisted property name when the experiment is on-by-default, so that any user + // setting override lives in a different property namespace. + private static final String WEBVIEW_EXPERIMENTAL_PROPERTY = DEFAULT_TO_EXPERIMENTAL_WEBVIEW ? + EXPERIMENTAL_PROPERTY_DEFAULT_ON : EXPERIMENTAL_PROPERTY_DEFAULT_OFF; + private static final String FORCE_PROVIDER_PROPERTY = "webview.force_provider"; private static final String FORCE_PROVIDER_PROPERTY_VALUE_CHROMIUM = "chromium"; private static final String FORCE_PROVIDER_PROPERTY_VALUE_CLASSIC = "classic"; @@ -71,6 +78,18 @@ public final class WebViewFactory { } } + /** @hide */ + public static void setUseExperimentalWebView(boolean enable) { + SystemProperties.set(WebViewFactory.WEBVIEW_EXPERIMENTAL_PROPERTY, + enable ? "true" : "false"); + } + + /** @hide */ + public static boolean useExperimentalWebView() { + return SystemProperties.getBoolean(WEBVIEW_EXPERIMENTAL_PROPERTY, + DEFAULT_TO_EXPERIMENTAL_WEBVIEW); + } + static WebViewFactoryProvider getProvider() { synchronized (sProviderLock) { // For now the main purpose of this function (and the factory abstraction) is to keep @@ -112,17 +131,15 @@ public final class WebViewFactory { // WebView. This enables us to switch between implementations at runtime. private static boolean isExperimentalWebViewEnabled() { if (!isExperimentalWebViewAvailable()) return false; - boolean use_experimental_webview = SystemProperties.getBoolean( - WEBVIEW_EXPERIMENTAL_PROPERTY, DEFAULT_TO_EXPERIMENTAL_WEBVIEW); String forceProviderName = SystemProperties.get(FORCE_PROVIDER_PROPERTY); - if (forceProviderName.isEmpty()) return use_experimental_webview; + if (forceProviderName.isEmpty()) return useExperimentalWebView(); Log.i(LOGTAG, String.format("Provider overridden by property: %s=%s", FORCE_PROVIDER_PROPERTY, forceProviderName)); if (forceProviderName.equals(FORCE_PROVIDER_PROPERTY_VALUE_CHROMIUM)) return true; if (forceProviderName.equals(FORCE_PROVIDER_PROPERTY_VALUE_CLASSIC)) return false; Log.e(LOGTAG, String.format("Unrecognized provider: %s", forceProviderName)); - return use_experimental_webview; + return useExperimentalWebView(); } private static Class<WebViewFactoryProvider> getFactoryClass() throws ClassNotFoundException { |