Merge "Add onWlanSelected(boolean) and onDomainSelected(int,boolean)" into udc-dev (3b1f6292) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/domainselection/DomainSelectionConnection.java

+28 −4

Original line number	Diff line number	Diff line
		@@ -79,8 +79,8 @@ public class DomainSelectionConnection {
		}

		@Override
		public void onWlanSelected() {
		DomainSelectionConnection.this.onWlanSelected();
		public void onWlanSelected(boolean useEmergencyPdn) {
		DomainSelectionConnection.this.onWlanSelected(useEmergencyPdn);
		}

		@Override
		@@ -128,8 +128,9 @@ public class DomainSelectionConnection {
		}

		@Override
		public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain) {
		DomainSelectionConnection.this.onDomainSelected(domain);
		public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain,
		boolean useEmergencyPdn) {
		DomainSelectionConnection.this.onDomainSelected(domain, useEmergencyPdn);
		}

		@Override
		@@ -286,6 +287,16 @@ public class DomainSelectionConnection {
		// Can be overridden.
		}

		/**
		* Notifies that WLAN transport has been selected.
		*
		* @param useEmergencyPdn Indicates whether Wi-Fi emergency services use emergency PDN or not.
		*/
		public void onWlanSelected(boolean useEmergencyPdn) {
		// Can be overridden.
		onWlanSelected();
		}

		/**
		* Notifies that WWAN transport has been selected.
		*/
		@@ -324,6 +335,7 @@ public class DomainSelectionConnection {

		/**
		* Notifies the domain selected.
		*
		* @param domain The selected domain.
		*/
		public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain) {
		@@ -332,6 +344,18 @@ public class DomainSelectionConnection {
		future.complete(domain);
		}

		/**
		* Notifies the domain selected.
		*
		* @param domain The selected domain.
		* @param useEmergencyPdn Indicates whether emergency services use emergency PDN or not.
		*/
		public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain,
		boolean useEmergencyPdn) {
		// Can be overridden if required
		onDomainSelected(domain);
		}

		/**
		* Notifies that the emergency network scan is canceled.
		*/

src/java/com/android/internal/telephony/domainselection/EmergencyCallDomainSelectionConnection.java

+13 −10

Original line number	Diff line number	Diff line
		@@ -84,8 +84,9 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne

		/** {@inheritDoc} */
		@Override
		public void onWlanSelected() {
		public void onWlanSelected(boolean useEmergencyPdn) {
		mEmergencyStateTracker.onEmergencyTransportChanged(MODE_EMERGENCY_WLAN);
		if (useEmergencyPdn) {
		AccessNetworksManager anm = mPhone.getAccessNetworksManager();
		int transportType = anm.getPreferredTransport(ApnSetting.TYPE_EMERGENCY);
		logi("onWlanSelected curTransportType=" + transportType);
		@@ -93,6 +94,7 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne
		changePreferredTransport(TRANSPORT_TYPE_WLAN);
		return;
		}
		}

		CompletableFuture<Integer> future = getCompletableFuture();
		if (future != null) future.complete(DOMAIN_NON_3GPP_PS);
		@@ -112,8 +114,9 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne

		/** {@inheritDoc} */
		@Override
		public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain) {
		if (domain == DOMAIN_PS) {
		public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain,
		boolean useEmergencyPdn) {
		if (domain == DOMAIN_PS && useEmergencyPdn) {
		AccessNetworksManager anm = mPhone.getAccessNetworksManager();
		int transportType = anm.getPreferredTransport(ApnSetting.TYPE_EMERGENCY);
		logi("onDomainSelected curTransportType=" + transportType);
		@@ -122,7 +125,7 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne
		return;
		}
		}
		super.onDomainSelected(domain);
		super.onDomainSelected(domain, useEmergencyPdn);
		}

		/**

tests/telephonytests/src/com/android/internal/telephony/domainselection/EmergencyCallDomainSelectionConnectionTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ public class EmergencyCallDomainSelectionConnectionTest extends TelephonyTest {

		verify(mDomainSelectionController).selectDomain(any(), any());

		mTransportCallback.onWlanSelected();
		mTransportCallback.onWlanSelected(true);

		assertTrue(future.isDone());
		assertEquals((long) DOMAIN_NON_3GPP_PS, (long) future.get());
		@@ -156,7 +156,7 @@ public class EmergencyCallDomainSelectionConnectionTest extends TelephonyTest {
		assertFalse(future.isDone());
		verify(mEmergencyStateTracker).onEmergencyTransportChanged(MODE_EMERGENCY_WWAN);

		wwanCallback.onDomainSelected(DOMAIN_CS);
		wwanCallback.onDomainSelected(DOMAIN_CS, false);

		assertTrue(future.isDone());
		assertEquals((long) DOMAIN_CS, (long) future.get());
		@@ -193,7 +193,7 @@ public class EmergencyCallDomainSelectionConnectionTest extends TelephonyTest {
		assertFalse(future.isDone());
		verify(mEmergencyStateTracker).onEmergencyTransportChanged(MODE_EMERGENCY_WWAN);

		wwanCallback.onDomainSelected(DOMAIN_PS);
		wwanCallback.onDomainSelected(DOMAIN_PS, true);

		assertTrue(future.isDone());
		assertEquals((long) DOMAIN_PS, (long) future.get());

tests/telephonytests/src/com/android/internal/telephony/domainselection/NormalCallDomainSelectionConnectionTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ public class NormalCallDomainSelectionConnectionTest extends TelephonyTest {

		verify(mMockDomainSelectionController).selectDomain(any(), any());

		mTransportCallback.onWlanSelected();
		mTransportCallback.onWlanSelected(false);

		assertTrue(future.isDone());
		assertEquals((long) DOMAIN_PS, (long) future.get());
		@@ -126,7 +126,7 @@ public class NormalCallDomainSelectionConnectionTest extends TelephonyTest {
		WwanSelectorCallback wwanCallback = mTransportCallback.onWwanSelected();

		assertFalse(future.isDone());
		wwanCallback.onDomainSelected(DOMAIN_CS);
		wwanCallback.onDomainSelected(DOMAIN_CS, false);

		assertTrue(future.isDone());
		assertEquals((long) DOMAIN_CS, (long) future.get());
		@@ -151,7 +151,7 @@ public class NormalCallDomainSelectionConnectionTest extends TelephonyTest {
		WwanSelectorCallback wwanCallback = mTransportCallback.onWwanSelected();

		assertFalse(future.isDone());
		wwanCallback.onDomainSelected(DOMAIN_PS);
		wwanCallback.onDomainSelected(DOMAIN_PS, false);

		assertTrue(future.isDone());
		assertEquals((long) DOMAIN_PS, (long) future.get());