From 509ddd83fc9b0fc7a2075aae0192ddceb6962e70 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 29 Sep 2023 17:35:54 +0000
Subject: [PATCH] Revert "Extend unfreeze recents duration when running under
 tests"

Revert submission 24866277-recents_freeze_tests

Reason for revert: b/302267317

Reverted changes: /q/submissionid:24866277-recents_freeze_tests

Change-Id: I5b45bb157fe79467ad4da0998ea43e2caf637a5e
---
 services/core/java/com/android/server/wm/RecentTasks.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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