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

Commit cfbca8ec authored by Wink Saville's avatar Wink Saville
Browse files

Merge commit 'b575731e' into fix-merge-conflict 

* commit 'b575731e':
  Update PS state when radio off or unavailable

Change-Id: I87d25d297ef455763d20b2f9b6cad920514a4f05
parents 22d85a8e b575731e

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

+2 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
        switch (mCi.getRadioState()) {

            case RADIO_UNAVAILABLE:

                mNewSS.setStateOutOfService();

                mSS.setStateOutOfService();

                mNewCellLoc.setStateInvalid();

                setSignalStrengthDefaultValues();

                mGotCountryCode = false;
@@ -218,6 +219,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 


            case RADIO_OFF:

                mNewSS.setStateOff();

                mSS.setStateOff();

                mNewCellLoc.setStateInvalid();

                setSignalStrengthDefaultValues();

                mGotCountryCode = false;

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

100755 → 100644
+2 −0
Original line number Diff line number Diff line
@@ -857,6 +857,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
        switch (mCi.getRadioState()) {

        case RADIO_UNAVAILABLE:

            mNewSS.setStateOutOfService();

            mSS.setStateOutOfService();

            mNewCellLoc.setStateInvalid();

            setSignalStrengthDefaultValues();

            mGotCountryCode = false;
@@ -866,6 +867,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 


        case RADIO_OFF:

            mNewSS.setStateOff();

            mSS.setStateOff();

            mNewCellLoc.setStateInvalid();

            setSignalStrengthDefaultValues();

            mGotCountryCode = false;

src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+2 −0
Original line number Diff line number Diff line
@@ -747,6 +747,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
        switch (mCi.getRadioState()) {

            case RADIO_UNAVAILABLE:

                mNewSS.setStateOutOfService();

                mSS.setStateOutOfService();

                mNewCellLoc.setStateInvalid();

                setSignalStrengthDefaultValues();

                mGotCountryCode = false;
@@ -756,6 +757,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 


            case RADIO_OFF:

                mNewSS.setStateOff();

                mSS.setStateOff();

                mNewCellLoc.setStateInvalid();

                setSignalStrengthDefaultValues();

                mGotCountryCode = false;