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

Commit 19714d3e authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Update emergency mode for CDMA" am: 8ac8303f 

am: 92bdb551

Change-Id: I050b0bc42ac11e4f8ca8f0358dff1ea75aed45b2
parents 5aa42d31 92bdb551

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

+2 −2
Original line number Diff line number Diff line
@@ -1660,9 +1660,9 @@ public class ServiceStateTracker extends Handler { 
        mPollingContext[0]--;



        if (mPollingContext[0] == 0) {

            mNewSS.setEmergencyOnly(mEmergencyOnly);

            if (mPhone.isPhoneTypeGsm()) {

                updateRoamingState();

                mNewSS.setEmergencyOnly(mEmergencyOnly);

            } else {

                boolean namMatch = false;

                if (!isSidsAllZeros() && isHomeSid(mNewSS.getCdmaSystemId())) {
@@ -1804,6 +1804,7 @@ public class ServiceStateTracker extends Handler { 


                //Denial reason if registrationState = 3

                int reasonForDenial = networkRegState.getReasonForDenial();

                mEmergencyOnly = networkRegState.isEmergencyEnabled();

                if (mPhone.isPhoneTypeGsm()) {



                    mGsmRoaming = regCodeIsRoaming(registrationState);
@@ -1811,7 +1812,6 @@ public class ServiceStateTracker extends Handler { 


                    boolean isVoiceCapable = mPhone.getContext().getResources()

                            .getBoolean(com.android.internal.R.bool.config_voice_capable);

                    mEmergencyOnly = networkRegState.isEmergencyEnabled();

                } else {

                    int roamingIndicator = voiceSpecificStates.roamingIndicator;