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

Commit 53f1d370 authored by Jayachandran C's avatar Jayachandran C Committed by android-build-merger
Browse files

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

am: 48dc9587

Change-Id: I9d2ee1fc78f531ddde9518797db6e65742f3c03d
parents 4858d375 48dc9587

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;

        }