Merge "Change data connection state logic" (0bc2cefb) · Commits · e / os / android_frameworks_opt_telephony

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

+4 −10

Original line number	Original line	Diff line number	Diff line
	@@ -530,12 +530,6 @@ public class GsmCdmaPhone extends Phone {
	ret = PhoneConstants.DataState.DISCONNECTED;		ret = PhoneConstants.DataState.DISCONNECTED;
	} else { /* mSST.gprsState == ServiceState.STATE_IN_SERVICE */		} else { /* mSST.gprsState == ServiceState.STATE_IN_SERVICE */
	switch (mDcTracker.getState(apnType)) {		switch (mDcTracker.getState(apnType)) {
	case RETRYING:
	case FAILED:
	case IDLE:
	ret = PhoneConstants.DataState.DISCONNECTED;
	break;

	case CONNECTED:		case CONNECTED:
	case DISCONNECTING:		case DISCONNECTING:
	if ( mCT.mState != PhoneConstants.State.IDLE		if ( mCT.mState != PhoneConstants.State.IDLE
	@@ -545,11 +539,11 @@ public class GsmCdmaPhone extends Phone {
	ret = PhoneConstants.DataState.CONNECTED;		ret = PhoneConstants.DataState.CONNECTED;
	}		}
	break;		break;

	case CONNECTING:		case CONNECTING:
	case SCANNING:
	ret = PhoneConstants.DataState.CONNECTING;		ret = PhoneConstants.DataState.CONNECTING;
	break;		break;
			default:
			ret = PhoneConstants.DataState.DISCONNECTED;
	}		}
	}		}

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

+14 −2

Original line number	Original line	Diff line number	Diff line
	@@ -298,10 +298,22 @@ public class DataConnection extends StateMachine {
	return new LinkProperties(mLinkProperties);		return new LinkProperties(mLinkProperties);
	}		}

	boolean getIsInactive() {		boolean isInactive() {
	return getCurrentState() == mInactiveState;		return getCurrentState() == mInactiveState;
	}		}

			boolean isDisconnecting() {
			return getCurrentState() == mDisconnectingState;
			}

			boolean isActive() {
			return getCurrentState() == mActiveState;
			}

			boolean isActivating() {
			return getCurrentState() == mActivatingState;
			}

	int getCid() {		int getCid() {
	return mCid;		return mCid;
	}		}
	@@ -1265,7 +1277,7 @@ public class DataConnection extends StateMachine {
	break;		break;
	}		}
	case DcAsyncChannel.REQ_IS_INACTIVE: {		case DcAsyncChannel.REQ_IS_INACTIVE: {
	boolean val = getIsInactive();		boolean val = isInactive();
	if (VDBG) log("REQ_IS_INACTIVE isInactive=" + val);		if (VDBG) log("REQ_IS_INACTIVE isInactive=" + val);
	mAc.replyToMessage(msg, DcAsyncChannel.RSP_IS_INACTIVE, val ? 1 : 0);		mAc.replyToMessage(msg, DcAsyncChannel.RSP_IS_INACTIVE, val ? 1 : 0);
	break;		break;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -153,7 +153,7 @@ public class DcAsyncChannel extends AsyncChannel {
	value = false;		value = false;
	}		}
	} else {		} else {
	value = mDc.getIsInactive();		value = mDc.isInactive();
	}		}
	return value;		return value;
	}		}

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

+22 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1083,13 +1083,30 @@ public class DcTracker extends Handler {
	return null;		return null;
	}		}

	// Return state of specific apn type		/**
			* Returns {@link DctConstants.State} based on the state of the {@link DataConnection} that
			* contains a {@link ApnSetting} that supported the given apn type {@code anpType}.
			*
			* <p>
			* Assumes there is less than one {@link ApnSetting} can support the given apn type.
			*/
	public DctConstants.State getState(String apnType) {		public DctConstants.State getState(String apnType) {
	ApnContext apnContext = mApnContexts.get(apnType);		for (DataConnection dc : mDataConnections.values()) {
	if (apnContext != null) {		ApnSetting apnSetting = dc.getApnSetting();
	return apnContext.getState();		if (apnSetting != null && apnSetting.canHandleType(apnType)) {
			if (dc.isActive()) {
			return DctConstants.State.CONNECTED;
			} else if (dc.isActivating()) {
			return DctConstants.State.CONNECTING;
			} else if (dc.isInactive()) {
			return DctConstants.State.IDLE;
			} else if (dc.isDisconnecting()) {
			return DctConstants.State.DISCONNECTING;
	}		}
	return DctConstants.State.FAILED;		}
			}

			return DctConstants.State.IDLE;
	}		}

	// Return if apn type is a provisioning apn.		// Return if apn type is a provisioning apn.

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+40 −12

Original line number	Original line	Diff line number	Diff line
	@@ -604,7 +604,7 @@ public class DcTrackerTest extends TelephonyTest {

	logd("Sending EVENT_ENABLE_NEW_APN");		logd("Sending EVENT_ENABLE_NEW_APN");
	// APN id 0 is APN_TYPE_DEFAULT		// APN id 0 is APN_TYPE_DEFAULT
	mDct.setEnabled(0, true);		mDct.setEnabled(DctConstants.APN_DEFAULT_ID, true);
	waitForMs(200);		waitForMs(200);

	dataConnectionReasons = new DataConnectionReasons();		dataConnectionReasons = new DataConnectionReasons();
	@@ -678,7 +678,7 @@ public class DcTrackerTest extends TelephonyTest {

	logd("Sending EVENT_ENABLE_NEW_APN");		logd("Sending EVENT_ENABLE_NEW_APN");
	// APN id 0 is APN_TYPE_DEFAULT		// APN id 0 is APN_TYPE_DEFAULT
	mDct.setEnabled(0, true);		mDct.setEnabled(DctConstants.APN_DEFAULT_ID, true);
	waitForMs(200);		waitForMs(200);


	@@ -737,8 +737,8 @@ public class DcTrackerTest extends TelephonyTest {
	boolean dataEnabled = mDct.isUserDataEnabled();		boolean dataEnabled = mDct.isUserDataEnabled();
	mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,		mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,
	new String[]{PhoneConstants.APN_TYPE_DEFAULT, PhoneConstants.APN_TYPE_MMS});		new String[]{PhoneConstants.APN_TYPE_DEFAULT, PhoneConstants.APN_TYPE_MMS});
	mDct.setEnabled(5, true);		mDct.setEnabled(DctConstants.APN_IMS_ID, true);
	mDct.setEnabled(0, true);		mDct.setEnabled(DctConstants.APN_DEFAULT_ID, true);

	logd("Sending EVENT_RECORDS_LOADED");		logd("Sending EVENT_RECORDS_LOADED");
	mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_RECORDS_LOADED, null));		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_RECORDS_LOADED, null));
	@@ -791,8 +791,9 @@ public class DcTrackerTest extends TelephonyTest {

	mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,		mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,
	new String[]{PhoneConstants.APN_TYPE_DEFAULT, PhoneConstants.APN_TYPE_MMS});		new String[]{PhoneConstants.APN_TYPE_DEFAULT, PhoneConstants.APN_TYPE_MMS});
	mDct.setEnabled(5, true);
	mDct.setEnabled(0, true);		mDct.setEnabled(DctConstants.APN_IMS_ID, true);
			mDct.setEnabled(DctConstants.APN_DEFAULT_ID, true);

	logd("Sending EVENT_RECORDS_LOADED");		logd("Sending EVENT_RECORDS_LOADED");
	mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_RECORDS_LOADED, null));		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_RECORDS_LOADED, null));
	@@ -849,8 +850,8 @@ public class DcTrackerTest extends TelephonyTest {
	//set Default and MMS to be metered in the CarrierConfigManager		//set Default and MMS to be metered in the CarrierConfigManager
	mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,		mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,
	new String[]{PhoneConstants.APN_TYPE_DEFAULT, PhoneConstants.APN_TYPE_MMS});		new String[]{PhoneConstants.APN_TYPE_DEFAULT, PhoneConstants.APN_TYPE_MMS});
	mDct.setEnabled(5, true);		mDct.setEnabled(DctConstants.APN_IMS_ID, true);
	mDct.setEnabled(0, true);		mDct.setEnabled(DctConstants.APN_DEFAULT_ID, true);

	logd("Sending DATA_ENABLED_CMD");		logd("Sending DATA_ENABLED_CMD");
	mDct.setUserDataEnabled(true);		mDct.setUserDataEnabled(true);
	@@ -964,8 +965,8 @@ public class DcTrackerTest extends TelephonyTest {
	boolean dataEnabled = mDct.isUserDataEnabled();		boolean dataEnabled = mDct.isUserDataEnabled();
	mDct.setUserDataEnabled(true);		mDct.setUserDataEnabled(true);

	mDct.setEnabled(5, true);		mDct.setEnabled(DctConstants.APN_IMS_ID, true);
	mDct.setEnabled(0, true);		mDct.setEnabled(DctConstants.APN_DEFAULT_ID, true);

	logd("Sending EVENT_RECORDS_LOADED");		logd("Sending EVENT_RECORDS_LOADED");
	mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_RECORDS_LOADED, null));		mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_RECORDS_LOADED, null));
	@@ -1030,6 +1031,33 @@ public class DcTrackerTest extends TelephonyTest {
	any(Message.class));		any(Message.class));
	}		}

			@Test
			@SmallTest
			public void testGetDataConnectionState() throws Exception {
			initApns(PhoneConstants.APN_TYPE_SUPL,
			new String[]{PhoneConstants.APN_TYPE_SUPL, PhoneConstants.APN_TYPE_DEFAULT});
			mDct.setUserDataEnabled(false);

			mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,
			new String[]{PhoneConstants.APN_TYPE_DEFAULT});

			logd("Sending EVENT_RECORDS_LOADED");
			mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_RECORDS_LOADED, null));
			waitForMs(200);

			logd("Sending EVENT_DATA_CONNECTION_ATTACHED");
			mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_CONNECTION_ATTACHED, null));
			waitForMs(200);

			mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_TRY_SETUP_DATA, mApnContext));
			waitForMs(200);

			// Assert that both APN_TYPE_SUPL & APN_TYPE_DEFAULT are connected even we only setup data
			// for APN_TYPE_SUPL
			assertEquals(DctConstants.State.CONNECTED, mDct.getState(PhoneConstants.APN_TYPE_SUPL));
			assertEquals(DctConstants.State.CONNECTED, mDct.getState(PhoneConstants.APN_TYPE_DEFAULT));
			}

	// Test the unmetered APN setup when data is disabled.		// Test the unmetered APN setup when data is disabled.
	@Test		@Test
	@SmallTest		@SmallTest
	@@ -1233,7 +1261,7 @@ public class DcTrackerTest extends TelephonyTest {
	.getRilDataRadioTechnology();		.getRilDataRadioTechnology();
	mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,		mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,
	new String[]{PhoneConstants.APN_TYPE_DEFAULT});		new String[]{PhoneConstants.APN_TYPE_DEFAULT});
	mDct.setEnabled(0, true);		mDct.setEnabled(DctConstants.APN_DEFAULT_ID, true);
	mDct.setUserDataEnabled(true);		mDct.setUserDataEnabled(true);
	initApns(PhoneConstants.APN_TYPE_DEFAULT, new String[]{PhoneConstants.APN_TYPE_ALL});		initApns(PhoneConstants.APN_TYPE_DEFAULT, new String[]{PhoneConstants.APN_TYPE_ALL});

	@@ -1353,7 +1381,7 @@ public class DcTrackerTest extends TelephonyTest {
	.getRilDataRadioTechnology();		.getRilDataRadioTechnology();
	mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,		mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,
	new String[]{PhoneConstants.APN_TYPE_DEFAULT});		new String[]{PhoneConstants.APN_TYPE_DEFAULT});
	mDct.setEnabled(0, true);		mDct.setEnabled(DctConstants.APN_DEFAULT_ID, true);
	mDct.setUserDataEnabled(true);		mDct.setUserDataEnabled(true);
	initApns(PhoneConstants.APN_TYPE_DEFAULT, new String[]{PhoneConstants.APN_TYPE_ALL});		initApns(PhoneConstants.APN_TYPE_DEFAULT, new String[]{PhoneConstants.APN_TYPE_ALL});