Merge "Update VPN event strings for the IKE lib update" (5e7da1cf) · Commits · e / os / android_frameworks_base

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,