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

Commit 923a3440 authored by Avinash Nalluri's avatar Avinash Nalluri
Browse files

Update emergency mode for CDMA 

Currently emergency mode is set only for gsm.
Now, if RIL reports emergency registration for cdma,
emergecny mode will be set for cdma also in ServiceState.

Change-Id: I5e5416f38ab507759635e6a96c6012a772208c67
parent 3fd56935

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

+2 −2
Original line number Diff line number Diff line
@@ -1650,9 +1650,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())) {
@@ -1794,6 +1794,7 @@ public class ServiceStateTracker extends Handler { 


                //Denial reason if registrationState = 3

                int reasonForDenial = networkRegState.getReasonForDenial();

                mEmergencyOnly = networkRegState.isEmergencyEnabled();

                if (mPhone.isPhoneTypeGsm()) {



                    mGsmRoaming = regCodeIsRoaming(registrationState);
@@ -1801,7 +1802,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;