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

Commit 200b5204 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Deprecate WebSettings.setAppCacheEnabled and related." into rvc-dev am: 291cf5d2 

Change-Id: Ie9091d178da1762f4a65ceffb8a7edd28c669ba2
parents 1fa6697b 291cf5d2

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -58326,9 +58326,9 @@ package android.webkit { 
    method public abstract void setAllowFileAccess(boolean);

    method @Deprecated public abstract void setAllowFileAccessFromFileURLs(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 public abstract void setAppCachePath(String);

    method @Deprecated public abstract void setAppCachePath(String);

    method public abstract void setBlockNetworkImage(boolean);

    method public abstract void setBlockNetworkLoads(boolean);

    method public abstract void setBuiltInZoomControls(boolean);

core/java/android/webkit/WebSettings.java

+7 −1
Original line number Diff line number Diff line
@@ -1118,6 +1118,9 @@ public abstract class WebSettings { 
     * {@link #setAppCachePath}.

     *

     * @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);
@@ -1130,6 +1133,9 @@ public abstract class WebSettings { 
     * @param appCachePath a String path to the directory containing

     *                     Application Caches files.

     * @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);
@@ -1142,7 +1148,7 @@ public abstract class WebSettings { 
     * It is recommended to leave the maximum size set to the default value.

     *

     * @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

    public abstract void setAppCacheMaxSize(long appCacheMaxSize);