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

Commit d1c34f89 authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "If signal is lost, do not update the empty country iso for other slots"

parents 201b7876 22c37563

src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java

+7 −4
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ public class EmergencyNumberTracker extends Handler { 
            EmergencyNumberTracker emergencyNumberTracker;

            if (phone != null && phone.getEmergencyNumberTracker() != null) {

                emergencyNumberTracker = phone.getEmergencyNumberTracker();

                // If signal is lost, do not update the empty country iso for other slots.

                if (!TextUtils.isEmpty(countryIso)) {

                    if (TextUtils.isEmpty(emergencyNumberTracker.getEmergencyCountryIso())

                            || emergencyNumberTracker.mIsCountrySetByAnotherSub) {

                        emergencyNumberTracker.mIsCountrySetByAnotherSub = true;
@@ -305,6 +307,7 @@ public class EmergencyNumberTracker extends Handler { 
                }

            }

        }

    }



    private void onCarrierConfigChanged() {

        if (mPhone != null) {

tests/telephonytests/src/com/android/internal/telephony/emergency/EmergencyNumberTrackerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ public class EmergencyNumberTrackerTest extends TelephonyTest { 
        processAllMessages();

        assertTrue(mEmergencyNumberTrackerMock.getEmergencyCountryIso().equals(""));

        assertTrue(mEmergencyNumberTrackerMock.getLastKnownEmergencyCountryIso().equals("jp"));

        assertTrue(mEmergencyNumberTrackerMock2.getEmergencyCountryIso().equals(""));

        assertTrue(mEmergencyNumberTrackerMock2.getEmergencyCountryIso().equals("jp"));

        assertTrue(mEmergencyNumberTrackerMock2.getLastKnownEmergencyCountryIso().equals("jp"));

    }