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

Commit 48dc9587 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Set isGsm flag based on currently camped voice and data RATs"

parents 005b1b16 c09bbf92

src/java/com/android/internal/telephony/ServiceStateTracker.java

+9 −4
Original line number Diff line number Diff line
@@ -4284,10 +4284,15 @@ public class ServiceStateTracker extends Handler { 
     */

    protected boolean onSignalStrengthResult(AsyncResult ar) {

        boolean isGsm = false;

        //override isGsm for CDMA LTE

        if (mPhone.isPhoneTypeGsm() ||

                (mPhone.isPhoneTypeCdmaLte() &&

                        ServiceState.isLte(mSS.getRilDataRadioTechnology()))) {

        int dataRat = mSS.getRilDataRadioTechnology();

        int voiceRat = mSS.getRilVoiceRadioTechnology();



        // Override isGsm based on currently camped data and voice RATs

        // Set isGsm to true if the RAT belongs to GSM family and not IWLAN

        if ((dataRat != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN

                && ServiceState.isGsm(dataRat))

                || (voiceRat != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN

                && ServiceState.isGsm(voiceRat))) {

            isGsm = true;

        }