Merge "add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue" into nyc-dev
diff --git a/api/system-current.txt b/api/system-current.txt
index 1f54d5c..058fc78 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -34760,6 +34760,7 @@
field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
+ field public static final java.lang.String WEBVIEW_MULTIPROCESS = "webview_multiprocess";
field public static final java.lang.String WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN = "wifi_device_owner_configs_lockdown";
field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 770cde7..0074788 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7043,6 +7043,7 @@
* Developer setting to enable WebView multiprocess rendering.
* @hide
*/
+ @SystemApi
public static final String WEBVIEW_MULTIPROCESS = "webview_multiprocess";
/**