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

Commit f7683a6f authored by Nate Fischer's avatar Nate Fischer Committed by Android (Google) Code Review
Browse files

Merge "Add WebView Safe Browsing error code"

parents 956d00cb 3c7c9370

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -48766,6 +48766,7 @@ package android.webkit { 
    field public static final int ERROR_TIMEOUT = -8; // 0xfffffff8

    field public static final int ERROR_TOO_MANY_REQUESTS = -15; // 0xfffffff1

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

    field public static final int ERROR_UNSAFE_RESOURCE = -16; // 0xfffffff0

    field public static final int ERROR_UNSUPPORTED_AUTH_SCHEME = -3; // 0xfffffffd

    field public static final int ERROR_UNSUPPORTED_SCHEME = -10; // 0xfffffff6

  }

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -52356,6 +52356,7 @@ package android.webkit { 
    field public static final int ERROR_TIMEOUT = -8; // 0xfffffff8

    field public static final int ERROR_TOO_MANY_REQUESTS = -15; // 0xfffffff1

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

    field public static final int ERROR_UNSAFE_RESOURCE = -16; // 0xfffffff0

    field public static final int ERROR_UNSUPPORTED_AUTH_SCHEME = -3; // 0xfffffffd

    field public static final int ERROR_UNSUPPORTED_SCHEME = -10; // 0xfffffff6

  }

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -49135,6 +49135,7 @@ package android.webkit { 
    field public static final int ERROR_TIMEOUT = -8; // 0xfffffff8

    field public static final int ERROR_TOO_MANY_REQUESTS = -15; // 0xfffffff1

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

    field public static final int ERROR_UNSAFE_RESOURCE = -16; // 0xfffffff0

    field public static final int ERROR_UNSUPPORTED_AUTH_SCHEME = -3; // 0xfffffffd

    field public static final int ERROR_UNSUPPORTED_SCHEME = -10; // 0xfffffff6

  }

core/java/android/webkit/WebViewClient.java

+2 −0
Original line number Diff line number Diff line
@@ -234,6 +234,8 @@ public class WebViewClient { 
    public static final int ERROR_FILE_NOT_FOUND = -14;

    /** Too many requests during this load */

    public static final int ERROR_TOO_MANY_REQUESTS = -15;

    /** Resource load was cancelled by Safe Browsing */

    public static final int ERROR_UNSAFE_RESOURCE = -16;



    /**

     * Report an error to the host application. These errors are unrecoverable