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

Commit 36dd84e2 authored by Revathy Sivalingam's avatar Revathy Sivalingam Committed by Torbjorn Eklund
Browse files

Fix for updating the correct isUsingCarrierAggregation value 

Class Ratcherer might get incorrect value when calling
isUsingCarrierAggregation() if it is called after call to
setRilDataRadioTechnology(). This causes incorrect RAT icon to be shown.

Fix by calling isUsingCarrierAggregation() before
setRilDataRadioTechnology().

Bug: 116076180
Test: Manual - Checked that RAT icon matches RAT.
Change-Id: Ie4b73efb065e6468c2806c31beb9edc7e1fa2e74
parent 561aae59

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

+4 −3
Original line number Diff line number Diff line
@@ -111,6 +111,10 @@ public class RatRatcheter { 
            mDataRatchetEnabled = false;

            return;

        }



        boolean newUsingCA = oldSS.isUsingCarrierAggregation()

                || newSS.isUsingCarrierAggregation()

                || newSS.getCellBandwidths().length > 1;

        if (mVoiceRatchetEnabled) {

            int newVoiceRat = ratchetRat(oldSS.getRilVoiceRadioTechnology(),

                    newSS.getRilVoiceRadioTechnology());
@@ -129,9 +133,6 @@ public class RatRatcheter { 
            mDataRatchetEnabled = true;

        }



        boolean newUsingCA = oldSS.isUsingCarrierAggregation()

                || newSS.isUsingCarrierAggregation()

                || newSS.getCellBandwidths().length > 1;

        newSS.setIsUsingCarrierAggregation(newUsingCA);

    }