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

Commit 6df12a62 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:... 

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

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

Change-Id: Iecb6a937a920b73bbaf892136c03adc155ae5489
parents c96b2e4f e4e049c4

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,