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

Merge "Merge "Deprecate WebSettings.setAppCacheEnabled and related." into rvc-dev am: 291cf5d293 am: 02027c3a3d" into rvc-d1-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-05-12 19:45:49 +00:00
committed by Android (Google) Code Review
parent 9fc7e93f8a bc8c370346
commit 2bbfc85b2d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -58413,9 +58413,9 @@ package android.webkit {
method public abstract void setAllowFileAccess(boolean); method public abstract void setAllowFileAccess(boolean);
method @Deprecated public abstract void setAllowFileAccessFromFileURLs(boolean); method @Deprecated public abstract void setAllowFileAccessFromFileURLs(boolean);
method @Deprecated public abstract void setAllowUniversalAccessFromFileURLs(boolean); method @Deprecated public abstract void setAllowUniversalAccessFromFileURLs(boolean);
method public abstract void setAppCacheEnabled(boolean); method @Deprecated public abstract void setAppCacheEnabled(boolean);
method @Deprecated public abstract void setAppCacheMaxSize(long); method @Deprecated public abstract void setAppCacheMaxSize(long);
method public abstract void setAppCachePath(String); method @Deprecated public abstract void setAppCachePath(String);
method public abstract void setBlockNetworkImage(boolean); method public abstract void setBlockNetworkImage(boolean);
method public abstract void setBlockNetworkLoads(boolean); method public abstract void setBlockNetworkLoads(boolean);
method public abstract void setBuiltInZoomControls(boolean); method public abstract void setBuiltInZoomControls(boolean);

8
core/java/android/webkit/WebSettings.java
View File

@@ -1118,6 +1118,9 @@ public abstract class WebSettings {
* {@link #setAppCachePath}. * {@link #setAppCachePath}.
* *
* @param flag {@code true} if the WebView should enable Application Caches * @param flag {@code true} if the WebView should enable Application Caches
* @deprecated The Application Cache API is deprecated and this method will
* become a no-op on all Android versions once support is
* removed in Chromium. Consider using Service Workers instead.
*/ */
public abstract void setAppCacheEnabled(boolean flag); public abstract void setAppCacheEnabled(boolean flag);
@@ -1130,6 +1133,9 @@ public abstract class WebSettings {
* @param appCachePath a String path to the directory containing * @param appCachePath a String path to the directory containing
* Application Caches files. * Application Caches files.
* @see #setAppCacheEnabled * @see #setAppCacheEnabled
* @deprecated The Application Cache API is deprecated and this method will
* become a no-op on all Android versions once support is
* removed in Chromium. Consider using Service Workers instead.
*/ */
public abstract void setAppCachePath(String appCachePath); public abstract void setAppCachePath(String appCachePath);
@@ -1142,7 +1148,7 @@ public abstract class WebSettings {
* It is recommended to leave the maximum size set to the default value. * It is recommended to leave the maximum size set to the default value.
* *
* @param appCacheMaxSize the maximum size in bytes * @param appCacheMaxSize the maximum size in bytes
* @deprecated In future quota will be managed automatically. * @deprecated Quota is managed automatically; this method is a no-op.
*/ */
@Deprecated @Deprecated
public abstract void setAppCacheMaxSize(long appCacheMaxSize); public abstract void setAppCacheMaxSize(long appCacheMaxSize);