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

Commit 5ff213bc authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Fix for updating the correct isUsingCarrierAggregation value" am: b863c069 

am: 261979ce

Change-Id: I2df36e7371078e07413dd8f9c24eee7f1b7b0b97
parents 4ba44d38 261979ce

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);

    }