| commit | 7c9990ac07a557afeadc728df60b95c2d230a483 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jun 27 15:22:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 27 15:22:17 2024 +0000 |
| tree | 0bd64be6569a99dc656419e926c464e3f66de1e2 | |
| parent | 04c2fb7c07a6f85ed86acb3086742b52a345a660 [diff] | |
| parent | 7ad4eb3b4dbbe2c0c111833f80121f179cd5ee8b [diff] |
Merge "Fix WindowManager boot timeout on emulators" into main am: 7ad4eb3b4d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2926715 Change-Id: Ia6e14ecefecc63b9231c17b91a99c43775bdf499 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 b814ccd..aaa7f12 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3843,7 +3843,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();