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

Commit f644365c authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Set ServiceState before flags are evaluated" into mnc-dev

parents d1158a95 3194ecd5

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

+2 −4
Original line number Diff line number Diff line
@@ -308,8 +308,6 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 


    @Override

    protected void pollStateDone() {

        log("pollStateDone: lte 1 ss=[" + mSS + "] newSS=[" + mNewSS + "]");



        updateRoamingState();



        if (Build.IS_DEBUGGABLE && SystemProperties.getBoolean(PROP_FORCE_ROAMING, false)) {
@@ -318,6 +316,8 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
        }



        useDataRegStateForDataOnlyDevices();

        resetServiceStateInIwlanMode();

        log("pollStateDone: lte 1 ss=[" + mSS + "] newSS=[" + mNewSS + "]");



        boolean hasRegistered = mSS.getVoiceRegState() != ServiceState.STATE_IN_SERVICE

                && mNewSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE;
@@ -354,8 +354,6 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 


        boolean hasLocationChanged = !mNewCellLoc.equals(mCellLoc);



        resetServiceStateInIwlanMode();



        boolean has4gHandoff =

                mNewSS.getDataRegState() == ServiceState.STATE_IN_SERVICE &&

                (((mSS.getRilDataRadioTechnology() == ServiceState.RIL_RADIO_TECHNOLOGY_LTE) &&

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

+2 −4
Original line number Diff line number Diff line
@@ -1161,11 +1161,11 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
    }



    protected void pollStateDone() {

        if (DBG) log("pollStateDone: cdma oldSS=[" + mSS + "] newSS=[" + mNewSS + "]");



        updateRoamingState();



        useDataRegStateForDataOnlyDevices();

        resetServiceStateInIwlanMode();

        if (DBG) log("pollStateDone: cdma oldSS=[" + mSS + "] newSS=[" + mNewSS + "]");



        boolean hasRegistered =

            mSS.getVoiceRegState() != ServiceState.STATE_IN_SERVICE
@@ -1204,8 +1204,6 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 


        boolean hasLocationChanged = !mNewCellLoc.equals(mCellLoc);



		resetServiceStateInIwlanMode();



        TelephonyManager tm =

                (TelephonyManager) mPhone.getContext().getSystemService(Context.TELEPHONY_SERVICE);

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

+7 −10
Original line number Diff line number Diff line
@@ -1013,6 +1013,13 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
    }



    private void pollStateDone() {

        if (Build.IS_DEBUGGABLE && SystemProperties.getBoolean(PROP_FORCE_ROAMING, false)) {

            mNewSS.setVoiceRoaming(true);

            mNewSS.setDataRoaming(true);

        }

        useDataRegStateForDataOnlyDevices();

        resetServiceStateInIwlanMode();



        if (DBG) {

            log("Poll ServiceState done: " +

                " oldSS=[" + mSS + "] newSS=[" + mNewSS + "]" +
@@ -1022,13 +1029,6 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
                " mNewReasonDataDenied=" + mNewReasonDataDenied);

        }



        if (Build.IS_DEBUGGABLE && SystemProperties.getBoolean(PROP_FORCE_ROAMING, false)) {

            mNewSS.setVoiceRoaming(true);

            mNewSS.setDataRoaming(true);

        }



        useDataRegStateForDataOnlyDevices();



        boolean hasRegistered =

            mSS.getVoiceRegState() != ServiceState.STATE_IN_SERVICE

            && mNewSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE;
@@ -1068,9 +1068,6 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
        boolean hasDataRoamingOff = mSS.getDataRoaming() && !mNewSS.getDataRoaming();



        boolean hasLocationChanged = !mNewCellLoc.equals(mCellLoc);



		resetServiceStateInIwlanMode();



        TelephonyManager tm =

                (TelephonyManager) mPhone.getContext().getSystemService(Context.TELEPHONY_SERVICE);