Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue" into nyc-dev

Browse Source 
am: cf7518f78a

* commit 'cf7518f78af84aaafc7cd38ff69eec357a5b3055':
  add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue
This commit is contained in:
Toby Sargeant
2016-02-23 10:37:24 +00:00
committed by android-build-merger
parent 8d95e5fd05 cf7518f78a
commit 13d95c2afd
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -34760,6 +34760,7 @@ package android.provider {
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";

1
core/java/android/provider/Settings.java
View File

@@ -7043,6 +7043,7 @@ public final class Settings {
* Developer setting to enable WebView multiprocess rendering.
* @hide
*/
@SystemApi
public static final String WEBVIEW_MULTIPROCESS = "webview_multiprocess";
/**