commit 7ad4eb3b4dbbe2c0c111833f80121f179cd5ee8b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 27 14:47:51 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 27 14:47:51 2024 +0000
tree f5ea47637158c85374d67c74af65d9d021396d12
parent f8b9ab1eded66786de4f55390744cc39e2279362
parent 4e308b2381fed1dd546ef4670bd30063e2d54709

Merge "Fix WindowManager boot timeout on emulators" into main

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index ae5a5cb..8d6be09 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3693,7 +3693,7 @@
             hideBootMessagesLocked();
             // If the screen still doesn't come up after 30 seconds, give
             // up and turn it on.
-            mH.sendEmptyMessageDelayed(H.BOOT_TIMEOUT, 30 * 1000);
+            mH.sendEmptyMessageDelayed(H.BOOT_TIMEOUT, 30 * 1000 * Build.HW_TIMEOUT_MULTIPLIER);
         }
 
         mPolicy.systemBooted();