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

Commit 3e8d0db5 authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Move notifyOutgoingEmergencyCall into Telecom" am: bd0f4fed am: e1845639 am: 8d7019c2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1469908

Change-Id: Ifc499b81bcb21ee964fd059633036c1ba310bf37
parents 4afdf5bf 8d7019c2

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

+0 −6
Original line number Diff line number Diff line
@@ -209,12 +209,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(

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

+0 −5
Original line number Diff line number Diff line
@@ -2639,11 +2639,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);

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

+0 −3
Original line number Diff line number Diff line
@@ -104,9 +104,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);

tests/telephonytests/src/com/android/internal/telephony/PhoneStateListenerTest.java

+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));