diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 14:39:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-21 14:39:01 -0700 |
| commit | 75c0928c59346e989ecb45ecade5681d8253ff46 (patch) | |
| tree | b9fd691a0da869dfc1bbe55b66618b12cb53b566 /packages | |
| parent | 4eb5479bdf06d9484a4d68959f96cc0cea41a2d5 (diff) | |
| parent | 8ece3445e8c95d02a47737ea2ac2d52a696143cd (diff) | |
| download | frameworks_base-75c0928c59346e989ecb45ecade5681d8253ff46.zip frameworks_base-75c0928c59346e989ecb45ecade5681d8253ff46.tar.gz frameworks_base-75c0928c59346e989ecb45ecade5681d8253ff46.tar.bz2 | |
am 8ece3445: Merge change 8061 into donut
Merge commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd'
* commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd':
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(); } } |