commit 8964f46bfa330ef4feb37702e725ebb46482b2e6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue May 07 01:46:53 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 07 01:46:53 2024 +0000
tree a205566d66a4e0233fdb592f75907338ee4e6a2c
parent 4d5ac08beece8aff6eae64e678692e6e7e722624
parent 9ca7bd924246e24f605aa3336154b9da46b4d674

Merge "Correct Shutdown Behaviour in Suspend sequence" into main

service/src/com/android/car/power/CarPowerManagementService.java

diff --git a/service/src/com/android/car/power/CarPowerManagementService.java b/service/src/com/android/car/power/CarPowerManagementService.java
index 7ab0dc1..aa557c6 100644
--- a/service/src/com/android/car/power/CarPowerManagementService.java
+++ b/service/src/com/android/car/power/CarPowerManagementService.java
@@ -2772,6 +2772,7 @@
         long retryIntervalMs = INITIAL_SUSPEND_RETRY_INTERVAL_MS;
         long totalWaitDurationMs = 0;
         while (true) {
+            long suspendStartTime = SystemClock.elapsedRealtime();
             Slogf.i(TAG, "Entering %s", suspendTarget);
             if (isSuspendToDisk) {
                 freeMemory();
@@ -2797,7 +2798,7 @@
                         return false;
                     }
                 }
-
+                long suspendStopTime = SystemClock.elapsedRealtime();
                 Slogf.w(TAG, "Failed to Suspend; will retry after %dms", retryIntervalMs);
                 try {
                     mLock.wait(retryIntervalMs);
@@ -2805,6 +2806,7 @@
                     Thread.currentThread().interrupt();
                 }
                 totalWaitDurationMs += retryIntervalMs;
+                totalWaitDurationMs += (suspendStopTime - suspendStartTime);
                 retryIntervalMs = Math.min(retryIntervalMs * 2, MAX_RETRY_INTERVAL_MS);
             }
         }