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

Commit e88f2ad9 authored by jt1134's avatar jt1134
Browse files

telephony: CDMA: fix ERI display when device is in airplane mode 

currently when a CDMA device is in airplane mode, the ERI display
shows "Searching for Service"
the radio is OFF, and not searching for anything, so fix it to
actually display the radio status correctly

Change-Id: I3acfb509291867e1a8e35163a89d86719aa40479
parent 37076b09

core/res/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ 
    <string name="roamingText11">Roaming Banner On</string>

    <string name="roamingText12">Roaming Banner Off</string>

    <string name="roamingTextSearching">Searching for Service</string>

    <string name="roamingTextAirplaneMode">Airplane Mode</string>





    <!--

telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java

+4 −0
Original line number Diff line number Diff line
@@ -359,6 +359,10 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
                // new ERI text

                if (ss.getState() == ServiceState.STATE_IN_SERVICE) {

                    eriText = phone.getCdmaEriText();

                } else if (ss.getState() == ServiceState.STATE_POWER_OFF) {

                    // We're in Airplane Mode

                    eriText = phone.getContext().getText(

                            com.android.internal.R.string.roamingTextAirplaneMode).toString();

                } else {

                    // Note that ServiceState.STATE_OUT_OF_SERVICE is valid used

                    // for

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+4 −0
Original line number Diff line number Diff line
@@ -951,6 +951,10 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
                // Now the CDMAPhone sees the new ServiceState so it can get the new ERI text

                if (ss.getState() == ServiceState.STATE_IN_SERVICE) {

                    eriText = phone.getCdmaEriText();

                } else if (ss.getState() == ServiceState.STATE_POWER_OFF) {

                    // We're in Airplane Mode

                    eriText = phone.getContext().getText(

                            com.android.internal.R.string.roamingTextAirplaneMode).toString();

                } else {

                    // Note that ServiceState.STATE_OUT_OF_SERVICE is valid used for

                    // mRegistrationState 0,2,3 and 4