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

Commit af3ecfc0 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "telephony: CDMA: fix ERI display when device is in airplane mode" into ics

parents 66ba139a e88f2ad9

core/res/res/values/strings.xml

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

    <string name="roamingText11">Roaming Banner On</string>

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

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

    <string name="roamingTextSearching">Searching for Service</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 Original line Diff line number Diff line
@@ -359,6 +359,10 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
                // new ERI text

                // new ERI text

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

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

                    eriText = phone.getCdmaEriText();

                    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 {

                } else {

                    // Note that ServiceState.STATE_OUT_OF_SERVICE is valid used

                    // Note that ServiceState.STATE_OUT_OF_SERVICE is valid used

                    // for

                    // for

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

+4 −0
Original line number Original line 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

                // Now the CDMAPhone sees the new ServiceState so it can get the new ERI text

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

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

                    eriText = phone.getCdmaEriText();

                    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 {

                } else {

                    // Note that ServiceState.STATE_OUT_OF_SERVICE is valid used for

                    // Note that ServiceState.STATE_OUT_OF_SERVICE is valid used for

                    // mRegistrationState 0,2,3 and 4

                    // mRegistrationState 0,2,3 and 4