Merge "Sent deactivation reason shutdown properly" into tm-dev (6f2d6240) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/data/DataNetwork.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2284,9 +2284,9 @@ public class DataNetwork extends StateMachine {
		mDataNetworkCallback.onTrackNetworkUnwanted(this);
		}

		// TODO: Need to support DataService.REQUEST_REASON_SHUTDOWN
		mDataServiceManagers.get(mTransport).deactivateDataCall(mCid.get(mTransport),
		DataService.REQUEST_REASON_NORMAL,
		reason == TEAR_DOWN_REASON_AIRPLANE_MODE_ON ? DataService.REQUEST_REASON_SHUTDOWN
		: DataService.REQUEST_REASON_NORMAL,
		obtainMessage(EVENT_DEACTIVATE_DATA_NETWORK_RESPONSE));
		mDataCallSessionStats.setDeactivateDataCallReason(DataService.REQUEST_REASON_NORMAL);
		mInvokedDataDeactivation = true;

+13 −0

Original line number	Diff line number	Diff line
		@@ -657,6 +657,19 @@ public class DataNetworkTest extends TelephonyTest {
		.isEqualTo(AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		}

		@Test
		public void testAirplaneModeShutdownDeactivateData() throws Exception {
		testCreateDataNetwork();

		mDataNetworkUT.tearDown(DataNetwork.TEAR_DOWN_REASON_AIRPLANE_MODE_ON);
		processAllMessages();

		// Make sure REQUEST_REASON_SHUTDOWN is sent when tear down reason is APM.
		verify(mMockedWwanDataServiceManager).deactivateDataCall(eq(123),
		eq(DataService.REQUEST_REASON_SHUTDOWN), any(Message.class));
		}


		@Test
		public void testCreateDataNetworkOnIwlan() throws Exception {
		doReturn(mIwlanNetworkRegistrationInfo).when(mServiceState).getNetworkRegistrationInfo(