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

Commit 5e33a738 authored by Richard (Torne) Coles's avatar Richard (Torne) Coles Committed by Android (Google) Code Review
Browse files

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

parents 64fccbba c9d0f4c5

core/api/current.txt

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

    method public abstract int getCacheMode();

    method public abstract String getCursiveFontFamily();

    method @Deprecated public abstract boolean getDatabaseEnabled();

    method public abstract boolean getDatabaseEnabled();

    method @Deprecated public abstract String getDatabasePath();

    method public abstract int getDefaultFixedFontSize();

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

    method public abstract void setCacheMode(int);

    method public abstract void setCursiveFontFamily(String);

    method @Deprecated public abstract void setDatabaseEnabled(boolean);

    method 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

+0 −8
Original line number Diff line number Diff line
@@ -1203,11 +1203,7 @@ 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);



    /**
@@ -1240,11 +1236,7 @@ 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();



    /**