From 87d4c529e064ecdc53e904633a9d979cb80c1793 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Tue, 8 Feb 2022 11:18:24 +0900 Subject: [PATCH] Update VPN event strings for the IKE lib update With a recent update, the IKEv2 library exposed the internal errors happening on the link. This had us realize one error code was a little bit ill-named and the other can't be exposed because the system doesn't know about it happening. Update the name of the events for this. Test: m Change-Id: I228b8309acbb5f599b908633923b16cd09e9c0af --- core/java/android/net/VpnManager.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/core/java/android/net/VpnManager.java b/core/java/android/net/VpnManager.java index 319382691925f..0a2a0d1b02bcf 100644 --- a/core/java/android/net/VpnManager.java +++ b/core/java/android/net/VpnManager.java @@ -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,