am c52d55c5: Merge change 6608 into donut (ad921cb4) · Commits · e / os / android_frameworks_base

packages/VpnServices/src/com/android/server/vpn/VpnService.java

+21 −14

Original line number	Diff line number	Diff line
		@@ -189,7 +189,7 @@ abstract class VpnService<E extends VpnProfile> {

		mServiceHelper.stop();
		} catch (Throwable e) {
		Log.e(TAG, "onError()", e);
		Log.e(TAG, "onDisconnect()", e);
		onFinalCleanUp();
		}
		}
		@@ -219,22 +219,29 @@ abstract class VpnService<E extends VpnProfile> {
		}

		private void waitUntilConnectedOrTimedout() {
		// Run this in the background thread to not block UI
		new Thread(new Runnable() {
		public void run() {
		sleep(2000); // 2 seconds
		for (int i = 0; i < 60; i++) {
		if (VPN_IS_UP.equals(SystemProperties.get(VPN_UP))) {
		onConnected();
		return;
		} else if (mState != VpnState.CONNECTING) {
		break;
		}
		sleep(500); // 0.5 second
		}

		synchronized (this) {
		synchronized (VpnService.this) {
		if (mState == VpnState.CONNECTING) {
		Log.d(TAG, " connecting timed out !!");
		onError();
		}
		}
		}
		}).start();
		}

		private synchronized void onConnected() {
		Log.d(TAG, "onConnected()");