Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6cc1f15 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix WindowManager boot timeout on emulators" into main am: 7ad4eb3b am: 7c9990ac 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2926715



Change-Id: I6e39c4de619f7dcacf04d92af4fd7165cc5d488d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ea5ca84 7c9990ac

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

+1 −1
Original line number Diff line number Diff line
@@ -3796,7 +3796,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            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();