Merge "When we disconnect shutdown the StateMachine." (de1a43f6) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/util/AsyncChannel.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -444,6 +444,16 @@ public class AsyncChannel {
		if ((mConnection != null) && (mSrcContext != null)) {
		mSrcContext.unbindService(mConnection);
		}
		try {
		// Send the DISCONNECTED, although it may not be received
		// but its the best we can do.
		Message msg = Message.obtain();
		msg.what = CMD_CHANNEL_DISCONNECTED;
		msg.replyTo = mSrcMessenger;
		mDstMessenger.send(msg);
		} catch(Exception e) {
		}
		// Tell source we're disconnected.
		if (mSrcHandler != null) {
		replyDisconnected(STATUS_SUCCESSFUL);
		}

telephony/java/com/android/internal/telephony/DataConnection.java

+27 −11

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.internal.telephony;


		import com.android.internal.telephony.DataCallState.SetupResult;
		import com.android.internal.util.AsyncChannel;
		import com.android.internal.util.Protocol;
		import com.android.internal.util.State;
		@@ -39,6 +38,7 @@ import java.util.ArrayList;
		import java.util.Calendar;
		import java.util.HashMap;
		import java.util.List;
		import java.util.concurrent.atomic.AtomicInteger;

		/**
		* {@hide}
		@@ -65,8 +65,7 @@ public abstract class DataConnection extends StateMachine {
		protected static final boolean DBG = true;
		protected static final boolean VDBG = false;

		protected static Object mCountLock = new Object();
		protected static int mCount;
		protected static AtomicInteger mCount = new AtomicInteger(0);
		protected AsyncChannel mAc;

		protected List<ApnContext> mApnList = null;
		@@ -260,7 +259,6 @@ public abstract class DataConnection extends StateMachine {

		protected abstract void log(String s);


		//***** Constructor
		protected DataConnection(PhoneBase phone, String name, int id, RetryManager rm,
		DataConnectionTracker dct) {
		@@ -286,6 +284,27 @@ public abstract class DataConnection extends StateMachine {
		if (DBG) log("DataConnection constructor X");
		}

		/**
		* Shut down this instance and its state machine.
		*/
		private void shutDown() {
		if (DBG) log("shutDown");

		if (mAc != null) {
		mAc.disconnected();
		mAc = null;
		}
		mApnList = null;
		mReconnectIntent = null;
		mDataConnectionTracker = null;
		mApn = null;
		phone = null;
		mLinkProperties = null;
		mCapabilities = null;
		lastFailCause = null;
		userData = null;
		}

		/**
		* TearDown the data connection.
		*
		@@ -619,9 +638,11 @@ public abstract class DataConnection extends StateMachine {
		@Override
		public void exit() {
		phone.mCM.unregisterForRilConnected(getHandler());
		shutDown();
		}
		@Override
		public boolean processMessage(Message msg) {
		boolean retVal = HANDLED;
		AsyncResult ar;

		switch (msg.what) {
		@@ -639,14 +660,9 @@ public abstract class DataConnection extends StateMachine {
		}
		break;
		}
		case AsyncChannel.CMD_CHANNEL_DISCONNECT: {
		if (VDBG) log("CMD_CHANNEL_DISCONNECT");
		mAc.disconnect();
		break;
		}
		case AsyncChannel.CMD_CHANNEL_DISCONNECTED: {
		if (VDBG) log("CMD_CHANNEL_DISCONNECTED");
		mAc = null;
		quit();
		break;
		}
		case DataConnectionAc.REQ_IS_INACTIVE: {
		@@ -784,7 +800,7 @@ public abstract class DataConnection extends StateMachine {
		break;
		}

		return HANDLED;
		return retVal;
		}
		}
		private DcDefaultState mDefaultState = new DcDefaultState();

telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -51,11 +51,8 @@ public class CdmaDataConnection extends DataConnection {
		*/
		static CdmaDataConnection makeDataConnection(CDMAPhone phone, int id, RetryManager rm,
		DataConnectionTracker dct) {
		synchronized (mCountLock) {
		mCount += 1;
		}
		CdmaDataConnection cdmaDc = new CdmaDataConnection(phone, "CdmaDC-" + mCount,
		id, rm, dct);
		CdmaDataConnection cdmaDc = new CdmaDataConnection(phone,
		"CdmaDC-" + mCount.incrementAndGet(), id, rm, dct);
		cdmaDc.start();
		if (DBG) cdmaDc.log("Made " + cdmaDc.getName());
		return cdmaDc;

telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -56,10 +56,8 @@ public class GsmDataConnection extends DataConnection {
		*/
		static GsmDataConnection makeDataConnection(PhoneBase phone, int id, RetryManager rm,
		DataConnectionTracker dct) {
		synchronized (mCountLock) {
		mCount += 1;
		}
		GsmDataConnection gsmDc = new GsmDataConnection(phone, "GsmDC-" + mCount, id, rm, dct);
		GsmDataConnection gsmDc = new GsmDataConnection(phone,
		"GsmDC-" + mCount.incrementAndGet(), id, rm, dct);
		gsmDc.start();
		if (DBG) gsmDc.log("Made " + gsmDc.getName());
		return gsmDc;