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

Commit 00066db3 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 3a27b29e: Merge change 7069 into donut 

Merge commit '3a27b29e41777e58fbcdca440a00676915ebea4f'

* commit '3a27b29e41777e58fbcdca440a00676915ebea4f':
  Make VPN connect even when DNS is not present and other fixes.
parents 9cf0c475 f69c3647

vpn/java/android/net/vpn/VpnState.java

+6 −1
Original line number Diff line number Diff line
@@ -26,8 +26,13 @@ package android.net.vpn; 
 * {@link DISCONNECTING} and then {@link IDLE}.

 * {@link CANCELLED} is a state when a VPN connection attempt is aborted, and

 * is in transition to {@link IDLE}.

 * The {@link UNUSABLE} state indicates that the profile is not in a state for

 * connecting due to possibly the integrity of the fields or another profile is

 * connecting etc.

 * The {@link UNKNOWN} state indicates that the profile state is to be

 * determined.

 * {@hide}

 */

public enum VpnState {

    CONNECTING, DISCONNECTING, CANCELLED, CONNECTED, IDLE

    CONNECTING, DISCONNECTING, CANCELLED, CONNECTED, IDLE, UNUSABLE, UNKNOWN

}