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

Merge change 8061 into donut

Browse Source 
* changes:
  Throw a connecting exception when timed out.
This commit is contained in:
Android (Google) Code Review
2009-07-21 14:16:55 -07:00
parent db7db69a21 bb22192421
commit 8ece3445e8
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) { synchronized void onDisconnect(boolean cleanUpServices) {
try { try {
Log.d(TAG, " disconnecting VPN...");
mState = VpnState.DISCONNECTING; mState = VpnState.DISCONNECTING;
broadcastConnectivity(VpnState.DISCONNECTING); broadcastConnectivity(VpnState.DISCONNECTING);
mNotification.showDisconnect(); mNotification.showDisconnect();
@@ -217,6 +218,8 @@ abstract class VpnService<E extends VpnProfile> {
synchronized (VpnService.this) { synchronized (VpnService.this) {
if (mState == VpnState.CONNECTING) { if (mState == VpnState.CONNECTING) {
Log.d(TAG, " connecting timed out !!"); Log.d(TAG, " connecting timed out !!");
mError = newConnectingError(
new IOException("Connecting timed out"));
onError(); onError();
} }
} }