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

Commit 9056b2a8 authored by Chris Manton's avatar Chris Manton Committed by Android Git Automerger
Browse files

am 870008cb: Merge "Remove deprecated remote override checks" into mnc-dev 

* commit '870008cb':
  Remove deprecated remote override checks
parents 1b259221 870008cb

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

+0 −17
Original line number Original line Diff line number Diff line
@@ -1143,23 +1143,6 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
            log("updateRoamingState: no carrier config service available");

            log("updateRoamingState: no carrier config service available");

        }

        }





       /* NOTE(Deprecated) This roaming override uses a hidden API and is deprecated */

        if (mPhone.isMccMncMarkedAsNonRoaming(mNewSS.getOperatorNumeric()) ||

                mPhone.isSidMarkedAsNonRoaming(mNewSS.getSystemId())) {

            log("pollStateDone: override - marked as non-roaming.");

            mNewSS.setVoiceRoaming(false);

            mNewSS.setDataRoaming(false);

            mNewSS.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_OFF);

        } else if (mPhone.isMccMncMarkedAsRoaming(mNewSS.getOperatorNumeric()) ||

                mPhone.isSidMarkedAsRoaming(mNewSS.getSystemId())) {

            log("pollStateDone: override - marked as roaming.");

            mNewSS.setVoiceRoaming(true);

            mNewSS.setDataRoaming(true);

            mNewSS.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_ON);

            mNewSS.setCdmaEriIconMode(EriInfo.ROAMING_ICON_MODE_NORMAL);

        }

        /* End Deprecated */



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

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

            mNewSS.setVoiceRoaming(true);

            mNewSS.setVoiceRoaming(true);

            mNewSS.setDataRoaming(true);

            mNewSS.setDataRoaming(true);

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

+0 −8
Original line number Original line Diff line number Diff line
@@ -896,14 +896,6 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
            log("updateRoamingState: no carrier config service available");

            log("updateRoamingState: no carrier config service available");

        }

        }





        /* NOTE(Deprecated) This roaming override uses a hidden API and is deprecated */

        if (mPhone.isMccMncMarkedAsNonRoaming(mNewSS.getOperatorNumeric())) {

            roaming = false;

        } else if (mPhone.isMccMncMarkedAsRoaming(mNewSS.getOperatorNumeric())) {

            roaming = true;

        }

        /* End Deprecated */



        mNewSS.setVoiceRoaming(roaming);

        mNewSS.setVoiceRoaming(roaming);

        mNewSS.setDataRoaming(roaming);

        mNewSS.setDataRoaming(roaming);

    }

    }