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

Commit 8da4ce98 authored by Ayu Ishii's avatar Ayu Ishii Committed by Android (Google) Code Review
Browse files

Merge "Deprecate `setDatabaseEnabled` and `getDatabaseEnabled`" into main

parents 98ee0eea 1be3d213

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -57411,7 +57411,7 @@ package android.webkit { 
    method public abstract boolean getBuiltInZoomControls();

    method public abstract int getCacheMode();

    method public abstract String getCursiveFontFamily();

    method public abstract boolean getDatabaseEnabled();

    method @Deprecated public abstract boolean getDatabaseEnabled();

    method @Deprecated public abstract String getDatabasePath();

    method public abstract int getDefaultFixedFontSize();

    method public abstract int getDefaultFontSize();
@@ -57457,7 +57457,7 @@ package android.webkit { 
    method public abstract void setBuiltInZoomControls(boolean);

    method public abstract void setCacheMode(int);

    method public abstract void setCursiveFontFamily(String);

    method public abstract void setDatabaseEnabled(boolean);

    method @Deprecated public abstract void setDatabaseEnabled(boolean);

    method @Deprecated public abstract void setDatabasePath(String);

    method public abstract void setDefaultFixedFontSize(int);

    method public abstract void setDefaultFontSize(int);

core/java/android/webkit/WebSettings.java

+8 −0
Original line number Diff line number Diff line
@@ -1203,7 +1203,11 @@ public abstract class WebSettings { 
     * changes to this setting after that point.

     *

     * @param flag {@code true} if the WebView should use the database storage API

     * @deprecated WebSQL is deprecated and this method will become a no-op on all

     * Android versions once support is removed in Chromium. See

     * https://developer.chrome.com/blog/deprecating-web-sql for more information.

     */

    @Deprecated

    public abstract void setDatabaseEnabled(boolean flag);



    /**
@@ -1236,7 +1240,11 @@ public abstract class WebSettings { 
     *

     * @return {@code true} if the database storage API is enabled

     * @see #setDatabaseEnabled

     * @deprecated WebSQL is deprecated and this method will become a no-op on all

     * Android versions once support is removed in Chromium. See

     * https://developer.chrome.com/blog/deprecating-web-sql for more information.

     */

    @Deprecated

    public abstract boolean getDatabaseEnabled();



    /**