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

Commit 96646cc3 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Android (Google) Code Review
Browse files

Merge "Set isGsm flag based on currently camped voice and data RATs" into oc-dev

parents ef2b6345 1ac51f1b

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

+9 −4
Original line number Diff line number Diff line
@@ -4275,10 +4275,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;

        }