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

Commit bdb0d88c authored by Hunsuk Choi's avatar Hunsuk Choi
Browse files

Add logs to EmergencyCallDomainSelectionConnection 

Bug: 243344927
Test: atest EmergencyCallDomainSelectionConnectionTest
Change-Id: Ic6a61ea4e861de6deeed60b2932064f84bee90de
parent 83e50b48

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

+9 −2
Original line number Diff line number Diff line
@@ -86,7 +86,9 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne 
    public void onWlanSelected() {

        mEmergencyStateTracker.onEmergencyTransportChanged(MODE_EMERGENCY_WLAN);

        AccessNetworksManager anm = mPhone.getAccessNetworksManager();

        if (anm.getPreferredTransport(ApnSetting.TYPE_EMERGENCY) != TRANSPORT_TYPE_WLAN) {

        int transportType = anm.getPreferredTransport(ApnSetting.TYPE_EMERGENCY);

        logi("onWlanSelected curTransportType=" + transportType);

        if (transportType != TRANSPORT_TYPE_WLAN) {

            changePreferredTransport(TRANSPORT_TYPE_WLAN);

            return;

        }
@@ -112,7 +114,9 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne 
    public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain) {

        if (domain == DOMAIN_PS) {

            AccessNetworksManager anm = mPhone.getAccessNetworksManager();

            if (anm.getPreferredTransport(ApnSetting.TYPE_EMERGENCY) != TRANSPORT_TYPE_WWAN) {

            int transportType = anm.getPreferredTransport(ApnSetting.TYPE_EMERGENCY);

            logi("onDomainSelected curTransportType=" + transportType);

            if (transportType != TRANSPORT_TYPE_WWAN) {

                changePreferredTransport(TRANSPORT_TYPE_WWAN);

                return;

            }
@@ -136,6 +140,7 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne 
    }



    private void changePreferredTransport(@TransportType int transportType) {

        logi("changePreferredTransport " + transportType);

        initHandler();

        mPreferredTransportType = transportType;

        AccessNetworksManager anm = mPhone.getAccessNetworksManager();
@@ -155,6 +160,8 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne 
    protected void onQualifiedNetworksChanged() {

        AccessNetworksManager anm = mPhone.getAccessNetworksManager();

        int preferredTransport = anm.getPreferredTransport(ApnSetting.TYPE_EMERGENCY);

        logi("onQualifiedNetworksChanged preferred=" + mPreferredTransportType

                + ", current=" + preferredTransport);

        if (preferredTransport == mPreferredTransportType) {

            CompletableFuture<Integer> future = getCompletableFuture();

            if (future != null) future.complete(DOMAIN_PS);