Merge "Route GsmCdmaPhone#exitEmergencyCallbackMode() to EmergencyStateTracker" into 24D1-dev (ce1a2af3) · Commits · e / os / android_frameworks_opt_telephony

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -4175,6 +4175,10 @@ public class GsmCdmaPhone extends Phone {
		Rlog.d(LOG_TAG, "exitEmergencyCallbackMode: mImsPhone=" + mImsPhone
		+ " isPhoneTypeGsm=" + isPhoneTypeGsm());
		}
		if (DomainSelectionResolver.getInstance().isDomainSelectionSupported()) {
		EmergencyStateTracker.getInstance().exitEmergencyCallbackMode();
		return;
		}
		if (mImsPhone != null && mImsPhone.isInImsEcm()) {
		mImsPhone.exitEmergencyCallbackMode();
		} else {

+5 −1

Original line number	Diff line number	Diff line
		@@ -2712,6 +2712,9 @@ public class GsmCdmaPhoneTest extends TelephonyTest {
		doReturn(true).when(dsResolver).isDomainSelectionSupported();
		DomainSelectionResolver.setDomainSelectionResolver(dsResolver);

		EmergencyStateTracker est = Mockito.mock(EmergencyStateTracker.class);
		replaceInstance(EmergencyStateTracker.class, "INSTANCE", null, est);

		mPhoneUT.handleMessage(mPhoneUT.obtainMessage(
		GsmCdmaPhone.EVENT_EMERGENCY_CALLBACK_MODE_ENTER));

		@@ -2721,7 +2724,8 @@ public class GsmCdmaPhoneTest extends TelephonyTest {
		mPhoneUT.exitEmergencyCallbackMode();
		processAllMessages();

		verify(mContext, never()).sendStickyBroadcastAsUser(any(), any());
		// Verify that the request is routed to EmergencyStateTracker.
		verify(est).exitEmergencyCallbackMode();
		}

		@Test