Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8ece3445: Merge change 8061 into donut

Browse Source 
Merge commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd'

* commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd':
  Throw a connecting exception when timed out.
This commit is contained in:
Android (Google) Code Review
2009-07-21 14:39:01 -07:00
committed by Android Git Automerger
parent 4eb5479bdf 8ece3445e8
commit 75c0928c59
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/VpnServices/src/com/android/server/vpn/VpnService.java
View File

@@ -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();
}
}