| commit | b6cc1f15561928fd3db1d5a60d9c2ab3b2096c67 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jun 27 15:41:03 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 27 15:41:03 2024 +0000 |
| tree | e1e0ea960794612045061cefbb3d56960f17cea2 | |
| parent | 6ea5ca84adfe84f9b18129f8954c7af552d48431 [diff] | |
| parent | 7c9990ac07a557afeadc728df60b95c2d230a483 [diff] |
Merge "Fix WindowManager boot timeout on emulators" into main am: 7ad4eb3b4d am: 7c9990ac07 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2926715 Change-Id: I6e39c4de619f7dcacf04d92af4fd7165cc5d488d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 72ec058..5215609 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3796,7 +3796,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();