Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a220b3c5 authored by Hall Liu's avatar Hall Liu
Browse files

Move notifyOutgoingEmergencyCall into Telecom

Bug: 162647577
Test: atest CtsTelecomTestCases:OutgoingCallTest
Change-Id: I525f527a9d65fca5a1ef1cbe87907614344774c1
parent 694ea86d
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -206,12 +206,6 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
        mTelephonyRegistryMgr.notifyEmergencyNumberList(sender.getSubId(), sender.getPhoneId());
    }

    @Override
    public void notifyOutgoingEmergencyCall(Phone sender, EmergencyNumber emergencyNumber) {
        mTelephonyRegistryMgr.notifyOutgoingEmergencyCall(
                sender.getPhoneId(), sender.getSubId(), emergencyNumber);
    }

    @Override
    public void notifyOutgoingEmergencySms(Phone sender, EmergencyNumber emergencyNumber) {
        mTelephonyRegistryMgr.notifyOutgoingEmergencySms(
+0 −5
Original line number Diff line number Diff line
@@ -2628,11 +2628,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
        mNotifier.notifyEmergencyNumberList(this);
    }

    /** Notify the outgoing call {@link EmergencyNumber} changes. */
    public void notifyOutgoingEmergencyCall(EmergencyNumber emergencyNumber) {
        mNotifier.notifyOutgoingEmergencyCall(this, emergencyNumber);
    }

    /** Notify the outgoing Sms {@link EmergencyNumber} changes. */
    public void notifyOutgoingEmergencySms(EmergencyNumber emergencyNumber) {
        mNotifier.notifyOutgoingEmergencySms(this, emergencyNumber);
+0 −3
Original line number Diff line number Diff line
@@ -92,9 +92,6 @@ public interface PhoneNotifier {
    /** Notify of change to EmergencyNumberList. */
    void notifyEmergencyNumberList(Phone sender);

    /** Notify of a change for Outgoing Emergency Call. */
    void notifyOutgoingEmergencyCall(Phone sender, EmergencyNumber emergencyNumber);

    /** Notify of a change for Outgoing Emergency Sms. */
    void notifyOutgoingEmergencySms(Phone sender, EmergencyNumber emergencyNumber);

+4 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify;

import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
import android.telephony.emergency.EmergencyNumber;
import android.test.suitebuilder.annotation.SmallTest;
import android.testing.AndroidTestingRunner;
@@ -61,7 +62,8 @@ public class PhoneStateListenerTest extends TelephonyTest {
                mUserMobileDataState = true;
            }

            public void onOutgoingEmergencyCall(EmergencyNumber emergencyNumber) {
            public void onOutgoingEmergencyCall(EmergencyNumber emergencyNumber,
                    int subscriptionId) {
                logd("OutgoingCallEmergencyNumber Changed");
                mCalledEmergencyNumber = emergencyNumber;
            }
@@ -125,7 +127,7 @@ public class PhoneStateListenerTest extends TelephonyTest {
                EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL);

        ((IPhoneStateListener) field.get(mPhoneStateListenerUT)).onOutgoingEmergencyCall(
                emergencyNumber);
                emergencyNumber, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
        processAllMessages();

        assertTrue(mCalledEmergencyNumber.equals(emergencyNumber));