diff options
| author | 2023-12-21 00:13:49 +0000 | |
|---|---|---|
| committer | 2023-12-21 00:13:49 +0000 | |
| commit | 8da4ce9819c151f5f0dc7353daea91c014745c60 (patch) | |
| tree | 0a3f71478bf2fdac62c0f38b4a5e75539e2d146a | |
| parent | 98ee0eeaaeb7f6246fe0c05ad5549a4c33ebf908 (diff) | |
| parent | 1be3d213c352618f5cd18031827d2a2ff2fe2151 (diff) | |
Merge "Deprecate `setDatabaseEnabled` and `getDatabaseEnabled`" into main
| -rw-r--r-- | core/api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index a85a42169dcb..43ff0c9c6bbd 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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); diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 14c53489ba3a..d12eda35c745 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -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(); /** |