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

Commit 0d1e12fb authored by Piotr Wilczyński's avatar Piotr Wilczyński
Browse files

DisplayManagerService.onBootPhase HW_TIMEOUT_MULTIPLIER 

Bug: 373398174
Flag: EXEMPT bugfix
Test: DisplayManagerServiceTest
Change-Id: I6e3e0ee1671410dd1d17df32a0ec25dcf37559c2
parent 34f9f07e

services/core/java/com/android/server/display/DisplayManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import static android.hardware.display.DisplayViewport.VIEWPORT_EXTERNAL; 
import static android.hardware.display.DisplayViewport.VIEWPORT_INTERNAL;

import static android.hardware.display.DisplayViewport.VIEWPORT_VIRTUAL;

import static android.hardware.display.HdrConversionMode.HDR_CONVERSION_UNSUPPORTED;

import static android.os.Build.HW_TIMEOUT_MULTIPLIER;

import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL;

import static android.os.Process.FIRST_APPLICATION_UID;

import static android.os.Process.ROOT_UID;
@@ -737,7 +738,7 @@ public final class DisplayManagerService extends SystemService { 
        if (phase == PHASE_WAIT_FOR_DEFAULT_DISPLAY) {

            synchronized (mSyncRoot) {

                long timeout = SystemClock.uptimeMillis()

                        + mInjector.getDefaultDisplayDelayTimeout();

                        + mInjector.getDefaultDisplayDelayTimeout() * HW_TIMEOUT_MULTIPLIER;

                while (mLogicalDisplayMapper.getDisplayLocked(Display.DEFAULT_DISPLAY) == null

                        || mVirtualDisplayAdapter == null) {

                    long delay = timeout - SystemClock.uptimeMillis();