commit 92f5216fc56fcecdec61594229b49eb354448ee4
author Sarah Chin <sarahchin@google.com> Tue Nov 15 18:35:14 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 15 18:35:14 2022 +0000
tree 516b826086faa927f0e1f781c2343bd3b222be52
parent 97d296b0890fe052c2c996d5e993277f077efff7
parent 5e354986ae021385783d7e53338b3ba92b99987c

Merge "Transition to current state after icon timers expire" into tm-qpr-dev

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

diff --git a/src/java/com/android/internal/telephony/NetworkTypeController.java b/src/java/com/android/internal/telephony/NetworkTypeController.java
index d27f400..cc2ca64 100644
--- a/src/java/com/android/internal/telephony/NetworkTypeController.java
+++ b/src/java/com/android/internal/telephony/NetworkTypeController.java
@@ -1106,6 +1106,8 @@
             removeMessages(EVENT_PRIMARY_TIMER_EXPIRED);
             mIsPrimaryTimerActive = false;
             mPrimaryTimerState = "";
+            transitionToCurrentState();
+            return;
         }
 
         if (mIsSecondaryTimerActive && !mSecondaryTimerState.equals(currentState)) {
@@ -1117,6 +1119,8 @@
             removeMessages(EVENT_SECONDARY_TIMER_EXPIRED);
             mIsSecondaryTimerActive = false;
             mSecondaryTimerState = "";
+            transitionToCurrentState();
+            return;
         }
 
         if (mIsPrimaryTimerActive || mIsSecondaryTimerActive) {