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

Commit 56936a1f authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Deprecate WebSettings.LOAD_NORMAL cache mode. 

After the switch to the Chromium network stack, this setting is
effectively the same as LOAD_DEFAULT, and having two settings
with the same meaning is confusing.

This change is blocking https://android-git.corp.google.com/g/205883 in CTS

Change-Id: I02cc23477f107e7f4cec37dcbad4f25503b5e840
parent c58392bc

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26739,7 +26739,7 @@ package android.webkit { 
    field public static final int LOAD_CACHE_ELSE_NETWORK = 1; // 0x1

    field public static final int LOAD_CACHE_ONLY = 3; // 0x3

    field public static final int LOAD_DEFAULT = -1; // 0xffffffff

    field public static final int LOAD_NORMAL = 0; // 0x0

    field public static final deprecated int LOAD_NORMAL = 0; // 0x0

    field public static final int LOAD_NO_CACHE = 2; // 0x2

  }

























core/java/android/webkit/WebSettings.java



+5
−1




























Original line number
Diff line number
Diff line








@@ -103,6 +103,10 @@ public abstract class WebSettings {





























    /**















     * Normal cache usage mode. Use with {@link #setCacheMode}.













     *













     * @deprecated This value is obsolete, as from API level













     * {@link android.os.Build.VERSION_CODES#HONEYCOMB} and onwards it has the













     * same effect as {@link #LOAD_DEFAULT}.















     */















    public static final int LOAD_NORMAL = 0;


























@@ -1253,7 +1257,7 @@ public abstract class WebSettings {













     * and content is re-validated as needed. When navigating back, content is















     * not revalidated, instead the content is just retrieved from the cache.















     * This method allows the client to override this behavior by specifying













     * one of {@link #LOAD_DEFAULT}, {@link #LOAD_NORMAL},













     * one of {@link #LOAD_DEFAULT},















     * {@link #LOAD_CACHE_ELSE_NETWORK}, {@link #LOAD_NO_CACHE} or















     * {@link #LOAD_CACHE_ONLY}. The default value is {@link #LOAD_DEFAULT}.















     *