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

Commit 804376ec authored by sqian's avatar sqian Committed by Shuo Qian
Browse files

EmergencyNumberTracker and ServiceStateTracker fetched by ImsPhone 

Test: Manual; Treehugger; Successfully made 911 call over IMS
Bug: 133874188
Change-Id: I7a1e73bbceed68da73b9985bf7396edf4cfb3c12
parent 13ff2eb1

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+11 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ import com.android.internal.telephony.TelephonyComponentFactory; 
import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.telephony.dataconnection.TransportManager;

import com.android.internal.telephony.emergency.EmergencyNumberTracker;

import com.android.internal.telephony.gsm.GsmMmiCode;

import com.android.internal.telephony.gsm.SuppServiceNotification;

import com.android.internal.telephony.uicc.IccRecords;
@@ -233,6 +234,16 @@ public class ImsPhone extends ImsPhoneBase { 
        return mCurrentSubscriberUris;

    }



    @Override

    public EmergencyNumberTracker getEmergencyNumberTracker() {

        return mDefaultPhone.getEmergencyNumberTracker();

    }



    @Override

    public ServiceStateTracker getServiceStateTracker() {

        return mDefaultPhone.getServiceStateTracker();

    }



    // Create Cf (Call forward) so that dialling number &

    // mIsCfu (true if reason is call forward unconditional)

    // mOnComplete (Message object passed by client) can be packed &

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java

+6 −0
Original line number Diff line number Diff line
@@ -766,6 +766,12 @@ public class ImsPhoneTest extends TelephonyTest { 
        verify(mImsManager, times(1)).setWfcMode(anyInt(), anyBoolean());

    }



    @Test

    public void testNonNullTrackersInImsPhone() throws Exception {

        assertNotNull(mImsPhoneUT.getEmergencyNumberTracker());

        assertNotNull(mImsPhoneUT.getServiceStateTracker());

    }



    private ServiceState getServiceStateDataAndVoice(int rat, int regState, boolean isRoaming) {

        ServiceState ss = new ServiceState();

        ss.setStateOutOfService();