Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update VPN event strings for the IKE lib update" am: 5e7da1cfc4

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

Change-Id: Ib83a61d746d318b3a0956076431882aa5dda2f29
This commit is contained in:
Treehugger Robot
2022-02-09 06:44:23 +00:00
committed by Automerger Merge Worker
parent 96d22e94c0 5e7da1cfc4
commit 09831a1aaa
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/net/VpnManager.java
View File

@@ -210,26 +210,19 @@ public class VpnManager {
*/ */
public static final int ERROR_CODE_NETWORK_TIMEOUT = 1; 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) * An error code to indicate the connection was reset. (e.g. SocketException)
* *
* @hide * @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. * An error code to indicate that there is an IOException.
* *
* @hide * @hide
*/ */
public static final int ERROR_CODE_NETWORK_IO = 4; public static final int ERROR_CODE_NETWORK_IO = 3;
/** @hide */ /** @hide */
@IntDef(value = {TYPE_VPN_NONE, TYPE_VPN_SERVICE, TYPE_VPN_PLATFORM, TYPE_VPN_LEGACY, @IntDef(value = {TYPE_VPN_NONE, TYPE_VPN_SERVICE, TYPE_VPN_PLATFORM, TYPE_VPN_LEGACY,