Ensure that a 5 minute disconnect will disable battery defender even if active

Test: 'atest HealthTestCases'
Bug: 170449952
Change-Id: If2be0b8ab802a6af45a97f8fbb93348b33455e1f

1 files changed, 6 insertions, 3 deletions

diff --git a/health/BatteryDefender.cpp b/health/BatteryDefender.cpp
index 277f75a6..e7e80c43 100644
--- a/health/BatteryDefender.cpp
+++ b/health/BatteryDefender.cpp
@@ -236,13 +236,16 @@ BatteryDefender::state_E BatteryDefender::stateMachine_getNextState(const state_
             case STATE_CONNECTED:
                 if (mTimeChargerPresentSecs > mTimeToActivateSecsModified) {
                     nextState = STATE_ACTIVE;
-                } else if (mTimeChargerNotPresentSecs > kTimeToClearTimerSecs) {
+                }
+                FALLTHROUGH_INTENDED;
+
+            case STATE_ACTIVE:
+                if (mTimeChargerNotPresentSecs > kTimeToClearTimerSecs) {
                     nextState = STATE_DISCONNECTED;
                 }
+
                 break;
 
-            case STATE_ACTIVE:
-                // Latch unless disabled or unless the health module has restarted (ie. reboot)
             default:
                 break;
         }