diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-09 06:58:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-09 06:58:01 +0000 |
| commit | e4e049c4f930b24559061dafeb53a4baf2a3d0ec (patch) | |
| tree | ff7016f6186e9bb01a82b11c8770e9b3d7ff1190 /core/java | |
| parent | 523aa85575ce519138a6a4f0c3fb41a42b1d5250 (diff) | |
| parent | 09831a1aaafa77fcafa38c96aec1dae4ebb0d29b (diff) | |
Merge "Update VPN event strings for the IKE lib update" am: 5e7da1cfc4 am: 09831a1aaa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976226
Change-Id: Id3fbe9b60bfc67c4e0ce2dbfb1f24979dddf730f
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/VpnManager.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/core/java/android/net/VpnManager.java b/core/java/android/net/VpnManager.java index 91327917f2d7..5aad997af8c1 100644 --- a/core/java/android/net/VpnManager.java +++ b/core/java/android/net/VpnManager.java @@ -211,25 +211,18 @@ 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, |