commit b863c069c182dda2e8f705f30edfb83359a6df72
author Pengquan Meng <mpq@google.com> Wed Dec 05 21:14:15 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 05 21:14:15 2018 +0000
tree 053049a9356970d6007c559cb3ca4a9a32e89abe
parent 06cf438398524ff024f5e8e6599fb21dd78d07d2
parent 36dd84e2b75b69232d78c3646f3f9cab482fa11b

Merge "Fix for updating the correct isUsingCarrierAggregation value"

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

diff --git a/src/java/com/android/internal/telephony/RatRatcheter.java b/src/java/com/android/internal/telephony/RatRatcheter.java
index 6b76414..59078a4 100644
--- a/src/java/com/android/internal/telephony/RatRatcheter.java
+++ b/src/java/com/android/internal/telephony/RatRatcheter.java
@@ -111,6 +111,10 @@
             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 @@
             mDataRatchetEnabled = true;
         }
 
-        boolean newUsingCA = oldSS.isUsingCarrierAggregation()
-                || newSS.isUsingCarrierAggregation()
-                || newSS.getCellBandwidths().length > 1;
         newSS.setIsUsingCarrierAggregation(newUsingCA);
     }