From bb22192421673c1cd2881c6fd80858c39a01273d Mon Sep 17 00:00:00 2001
From: Hung-ying Tyan <tyanh@google.com>
Date: Wed, 22 Jul 2009 04:37:39 +0800
Subject: Throw a connecting exception when timed out.

---
 packages/VpnServices/src/com/android/server/vpn/VpnService.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'packages')

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();
                     }
                 }
-- 
cgit v1.1