diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 14:16:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 14:16:55 -0700 |
| commit | 8ece3445e8c95d02a47737ea2ac2d52a696143cd (patch) | |
| tree | c415fb4d99a7e353a2dc1747861892144b282668 /packages | |
| parent | db7db69a2162439bf722d0f1f65429ca3ca19dcd (diff) | |
| parent | bb22192421673c1cd2881c6fd80858c39a01273d (diff) | |
| download | frameworks_base-8ece3445e8c95d02a47737ea2ac2d52a696143cd.zip frameworks_base-8ece3445e8c95d02a47737ea2ac2d52a696143cd.tar.gz frameworks_base-8ece3445e8c95d02a47737ea2ac2d52a696143cd.tar.bz2 | |
Merge change 8061 into donut
* changes:
Throw a connecting exception when timed out.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/VpnServices/src/com/android/server/vpn/VpnService.java | 3 |
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(); } } |