commit fcad9954d89b593608263734294713027c471d99
author Winson Chung <winsonc@google.com> Wed Sep 27 07:22:01 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 27 07:22:01 2023 +0000
tree 09d27ff807ccaf8098d2584dbca3be260350e054
parent 53c34da8c74f551aaf78d81905d2b8944bb0a208
parent b5898a5e8e06036ce7d953d90b34958e95626a2a

Merge "Extend unfreeze recents duration when running under tests" into main

services/core/java/com/android/server/wm/RecentTasks.java

diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java
index f33ecaa..184de58 100644
--- a/services/core/java/com/android/server/wm/RecentTasks.java
+++ b/services/core/java/com/android/server/wm/RecentTasks.java
@@ -301,9 +301,12 @@
         }
 
         // Always update the reordering time when this is called to ensure that the timeout
-        // is reset
+        // is reset.  Extend this duration when running in tests.
+        final long timeout = ActivityManager.isRunningInUserTestHarness()
+                ? mFreezeTaskListTimeoutMs * 10
+                : mFreezeTaskListTimeoutMs;
         mService.mH.removeCallbacks(mResetFreezeTaskListOnTimeoutRunnable);
-        mService.mH.postDelayed(mResetFreezeTaskListOnTimeoutRunnable, mFreezeTaskListTimeoutMs);
+        mService.mH.postDelayed(mResetFreezeTaskListOnTimeoutRunnable, timeout);
     }
 
     /**