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

Commit b575731e authored by Wink Saville's avatar Wink Saville Committed by Gerrit Code Review
Browse files

Merge "Update PS state when radio off or unavailable"

parents de707749 f1911ab8

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

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

            case RADIO_UNAVAILABLE:

                newSS.setStateOutOfService();

                mLteSS.setStateOutOfService();

                newCellLoc.setStateInvalid();

                setSignalStrengthDefaultValues();

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


            case RADIO_OFF:

                newSS.setStateOff();

                mLteSS.setStateOff();

                newCellLoc.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
@@ -832,6 +832,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
        switch (cm.getRadioState()) {

        case RADIO_UNAVAILABLE:

            newSS.setStateOutOfService();

            mNewDataConnectionState = ServiceState.STATE_OUT_OF_SERVICE;

            newCellLoc.setStateInvalid();

            setSignalStrengthDefaultValues();

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


        case RADIO_OFF:

            newSS.setStateOff();

            mNewDataConnectionState = ServiceState.STATE_POWER_OFF;

            newCellLoc.setStateInvalid();

            setSignalStrengthDefaultValues();

            mGotCountryCode = false;

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

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

            case RADIO_UNAVAILABLE:

                newSS.setStateOutOfService();

                newGPRSState = ServiceState.STATE_OUT_OF_SERVICE;

                newCellLoc.setStateInvalid();

                setSignalStrengthDefaultValues();

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


            case RADIO_OFF:

                newSS.setStateOff();

                newGPRSState = ServiceState.STATE_POWER_OFF;

                newCellLoc.setStateInvalid();

                setSignalStrengthDefaultValues();

                mGotCountryCode = false;