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

Commit e4e049c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update VPN event strings for the IKE lib update" am: 5e7da1cf am: 09831a1a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976226

Change-Id: Id3fbe9b60bfc67c4e0ce2dbfb1f24979dddf730f
parents 523aa855 09831a1a

core/java/android/net/VpnManager.java

+2 −9
Original line number Diff line number Diff line
@@ -210,26 +210,19 @@ public class VpnManager { 
     */

    public static final int ERROR_CODE_NETWORK_TIMEOUT = 1;



    /**

     * An error code to indicate that the connection is refused.

     *

     * @hide

     */

    public static final int ERROR_CODE_NETWORK_CONNECT = 2;



    /**

     * An error code to indicate the connection was reset. (e.g. SocketException)

     *

     * @hide

     */

    public static final int ERROR_CODE_NETWORK_CONNECTION_RESET = 3;

    public static final int ERROR_CODE_NETWORK_RESET = 2;



    /**

     * An error code to indicate that there is an IOException.

     *

     * @hide

     */

    public static final int ERROR_CODE_NETWORK_IO = 4;

    public static final int ERROR_CODE_NETWORK_IO = 3;



    /** @hide */

    @IntDef(value = {TYPE_VPN_NONE, TYPE_VPN_SERVICE, TYPE_VPN_PLATFORM, TYPE_VPN_LEGACY,