Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13d95c2a authored by Toby Sargeant's avatar Toby Sargeant Committed by android-build-merger
Browse files

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

am: cf7518f7

* commit 'cf7518f7':
  add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue
parents 8d95e5fd cf7518f7

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -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";



       /**