commit 9bb1107b3d6e65c461e1192b34f8822377c942f5
author Sarah Chin <sarahchin@google.com> Thu Oct 17 18:45:20 2019 -0700
committer Sarah Chin <sarahchin@google.com> Tue Nov 05 18:27:10 2019 +0000
tree 2d56f2c9028ca2a16bdfe4bf1941e21899e52fc6
parent 2109a63f2d4d87a968077a5bcf650bdf05d2041e

Fix short-circuiting for RatRacheter

Make sure updateBandwidths() is called in ServiceStateTracker
when PhysicalChannelConfig changes.

Bug: 142971868
Test: atest ServiceStateTrackerTest
Change-Id: Iedae6b8ee9bce32024d7b9272aa458e0c89d1ad0
Merged-In: Iedae6b8ee9bce32024d7b9272aa458e0c89d1ad0
(cherry picked from commit bbb806c59d5c392a3766caf15a9aef91460cd917)

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

diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index 9353ea1..eaa5593 100755
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -1562,10 +1562,11 @@
                         mNrStateChangedRegistrants.notifyRegistrants();
                         hasChanged = true;
                     }
+                    hasChanged |= RatRatcheter
+                            .updateBandwidths(getBandwidthsFromConfigs(list), mSS);
 
                     // Notify NR frequency, NR connection status or bandwidths changed.
-                    if (hasChanged
-                            || RatRatcheter.updateBandwidths(getBandwidthsFromConfigs(list), mSS)) {
+                    if (hasChanged) {
                         mPhone.notifyServiceStateChanged(mSS);
                     }
                 }