diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2009-07-14 16:19:17 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2009-07-14 16:29:22 +0800 |
| commit | 85646c1df349c09bdab4daf87a59700a0eb9fa10 (patch) | |
| tree | 04ea2219928115253fa0baeb83dc51befb57cfcf /vpn | |
| parent | c22ce6a738bbd757c71f8778defb015ea81ab33c (diff) | |
| download | frameworks_base-85646c1df349c09bdab4daf87a59700a0eb9fa10.zip frameworks_base-85646c1df349c09bdab4daf87a59700a0eb9fa10.tar.gz frameworks_base-85646c1df349c09bdab4daf87a59700a0eb9fa10.tar.bz2 | |
Make VPN connect even when DNS is not present and other fixes.
* Changes:
+ As title.
+ Add two new states to VpnState: UNKNOWN and UNUSABLE.
+ Add more debug messages when stopping a service and when DNS being
overridden.
Diffstat (limited to 'vpn')
| -rw-r--r-- | vpn/java/android/net/vpn/VpnState.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vpn/java/android/net/vpn/VpnState.java b/vpn/java/android/net/vpn/VpnState.java index ebd9364..6e61f9c 100644 --- a/vpn/java/android/net/vpn/VpnState.java +++ b/vpn/java/android/net/vpn/VpnState.java @@ -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 } |