Merge "Atoms: Mobile Connection" into pi-dev (c0e19dae) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/ServiceStateTracker.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ import android.util.EventLog;
		import android.util.LocalLog;
		import android.util.Pair;
		import android.util.SparseArray;
		import android.util.StatsLog;
		import android.util.TimeUtils;

		import com.android.internal.annotations.VisibleForTesting;
		@@ -2786,6 +2787,9 @@ public class ServiceStateTracker extends Handler {

		if (hasRilDataRadioTechnologyChanged) {
		tm.setDataNetworkTypeForPhone(mPhone.getPhoneId(), mSS.getRilDataRadioTechnology());
		StatsLog.write(StatsLog.MOBILE_RADIO_TECHNOLOGY_CHANGED,
		ServiceState.rilRadioTechnologyToNetworkType(mSS.getRilDataRadioTechnology()),
		mPhone.getPhoneId());

		if (ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN
		== mSS.getRilDataRadioTechnology()) {

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

+40 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import android.text.TextUtils;
		import android.util.LocalLog;
		import android.util.Pair;
		import android.util.SparseArray;
		import android.util.StatsLog;
		import android.util.TimeUtils;

		import com.android.internal.annotations.VisibleForTesting;
		@@ -1476,6 +1477,12 @@ public class DataConnection extends StateMachine {
		public void enter() {
		mTag += 1;
		if (DBG) log("DcInactiveState: enter() mTag=" + mTag);
		StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,
		StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__INACTIVE,
		mPhone.getPhoneId(), mId,
		mApnSetting != null ? (long) mApnSetting.typesBitmap : 0L,
		mApnSetting != null
		? mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT) : false);

		if (mConnectionParams != null) {
		if (DBG) {
		@@ -1565,6 +1572,15 @@ public class DataConnection extends StateMachine {
		* The state machine is activating a connection.
		*/
		private class DcActivatingState extends State {
		@Override
		public void enter() {
		StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,
		StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__ACTIVATING,
		mPhone.getPhoneId(), mId,
		mApnSetting != null ? (long) mApnSetting.typesBitmap : 0L,
		mApnSetting != null
		? mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT) : false);
		}
		@Override
		public boolean processMessage(Message msg) {
		boolean retVal;
		@@ -1673,6 +1689,12 @@ public class DataConnection extends StateMachine {

		@Override public void enter() {
		if (DBG) log("DcActiveState: enter dc=" + DataConnection.this);
		StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,
		StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__ACTIVE,
		mPhone.getPhoneId(), mId,
		mApnSetting != null ? (long) mApnSetting.typesBitmap : 0L,
		mApnSetting != null
		? mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT) : false);

		updateNetworkInfo();

		@@ -1978,6 +2000,15 @@ public class DataConnection extends StateMachine {
		* The state machine is disconnecting.
		*/
		private class DcDisconnectingState extends State {
		@Override
		public void enter() {
		StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,
		StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__DISCONNECTING,
		mPhone.getPhoneId(), mId,
		mApnSetting != null ? (long) mApnSetting.typesBitmap : 0L,
		mApnSetting != null
		? mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT) : false);
		}
		@Override
		public boolean processMessage(Message msg) {
		boolean retVal;
		@@ -2027,6 +2058,15 @@ public class DataConnection extends StateMachine {
		* The state machine is disconnecting after an creating a connection.
		*/
		private class DcDisconnectionErrorCreatingConnection extends State {
		@Override
		public void enter() {
		StatsLog.write(StatsLog.MOBILE_CONNECTION_STATE_CHANGED,
		StatsLog.MOBILE_CONNECTION_STATE_CHANGED__STATE__DISCONNECTION_ERROR_CREATING_CONNECTION,
		mPhone.getPhoneId(), mId,
		mApnSetting != null ? (long) mApnSetting.typesBitmap : 0L,
		mApnSetting != null
		? mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT) : false);
		}
		@Override
		public boolean processMessage(Message msg) {
		boolean retVal;