Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev (bb08c408) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/Vpn.java

+26 −34

Original line number	Diff line number	Diff line
		@@ -1544,9 +1544,6 @@ public class Vpn {
		public void exit() {
		// We assume that everything is reset after stopping the daemons.
		interrupt();
		for (LocalSocket socket : mSockets) {
		IoUtils.closeQuietly(socket);
		}
		agentDisconnect();
		try {
		mContext.unregisterReceiver(mBroadcastReceiver);
		@@ -1559,8 +1556,26 @@ public class Vpn {
		Log.v(TAG, "Waiting");
		synchronized (TAG) {
		Log.v(TAG, "Executing");
		try {
		execute();
		monitorDaemons();
		interrupted(); // Clear interrupt flag if execute called exit.
		} catch (InterruptedException e) {
		} finally {
		for (LocalSocket socket : mSockets) {
		IoUtils.closeQuietly(socket);
		}
		// This sleep is necessary for racoon to successfully complete sending delete
		// message to server.
		try {
		Thread.sleep(50);
		} catch (InterruptedException e) {
		}
		for (String daemon : mDaemons) {
		SystemService.stop(daemon);
		}
		}
		agentDisconnect();
		}
		}

		@@ -1759,18 +1774,6 @@ public class Vpn {
		Log.i(TAG, "Aborting", e);
		updateState(DetailedState.FAILED, e.getMessage());
		exit();
		} finally {
		// Kill the daemons if they fail to stop.
		if (!initFinished) {
		for (String daemon : mDaemons) {
		SystemService.stop(daemon);
		}
		}

		// Do not leave an unstable state.
		if (!initFinished \|\| mNetworkInfo.getDetailedState() == DetailedState.CONNECTING) {
		agentDisconnect();
		}
		}
		}

		@@ -1778,12 +1781,10 @@ public class Vpn {
		* Monitor the daemons we started, moving to disconnected state if the
		* underlying services fail.
		*/
		private void monitorDaemons() {
		private void monitorDaemons() throws InterruptedException{
		if (!mNetworkInfo.isConnected()) {
		return;
		}

		try {
		while (true) {
		Thread.sleep(2000);
		for (int i = 0; i < mDaemons.length; i++) {
		@@ -1792,15 +1793,6 @@ public class Vpn {
		}
		}
		}
		} catch (InterruptedException e) {
		Log.d(TAG, "interrupted during monitorDaemons(); stopping services");
		} finally {
		for (String daemon : mDaemons) {
		SystemService.stop(daemon);
		}

		agentDisconnect();
		}
		}
		}
		}