summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2009-07-22 04:37:39 +0800
committerHung-ying Tyan <tyanh@google.com>2009-07-22 04:37:39 +0800
commitbb22192421673c1cd2881c6fd80858c39a01273d (patch)
tree670c3d09431b64300a8cb69a20a897b010b6e973
parent2a1aa6acbba5a3a9142d3e8bd6fe6e19d5fae6be (diff)
downloadframeworks_base-bb22192421673c1cd2881c6fd80858c39a01273d.zip
frameworks_base-bb22192421673c1cd2881c6fd80858c39a01273d.tar.gz
frameworks_base-bb22192421673c1cd2881c6fd80858c39a01273d.tar.bz2
Throw a connecting exception when timed out.
-rw-r--r--packages/VpnServices/src/com/android/server/vpn/VpnService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/VpnServices/src/com/android/server/vpn/VpnService.java b/packages/VpnServices/src/com/android/server/vpn/VpnService.java
index 26322f4..87bd780 100644
--- a/packages/VpnServices/src/com/android/server/vpn/VpnService.java
+++ b/packages/VpnServices/src/com/android/server/vpn/VpnService.java
@@ -161,6 +161,7 @@ abstract class VpnService<E extends VpnProfile> {
synchronized void onDisconnect(boolean cleanUpServices) {
try {
+ Log.d(TAG, " disconnecting VPN...");
mState = VpnState.DISCONNECTING;
broadcastConnectivity(VpnState.DISCONNECTING);
mNotification.showDisconnect();
@@ -217,6 +218,8 @@ abstract class VpnService<E extends VpnProfile> {
synchronized (VpnService.this) {
if (mState == VpnState.CONNECTING) {
Log.d(TAG, " connecting timed out !!");
+ mError = newConnectingError(
+ new IOException("Connecting timed out"));
onError();
}
}