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

Commit d6385cd3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Call SurfaceControl.getBootDisplayModeSupport only one time""... 

Merge "Revert "Call SurfaceControl.getBootDisplayModeSupport only one time"" into tm-dev am: f594db70

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

Change-Id: I521e603941b4989bd5e1f8a7634445ab6bd8583c
parents 853f73c6 f594db70

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -73,8 +73,6 @@ final class LocalDisplayAdapter extends DisplayAdapter { 




    private final SurfaceControlProxy mSurfaceControlProxy;

    private final SurfaceControlProxy mSurfaceControlProxy;





    private final boolean mIsBootDisplayModeSupported;



    // Called with SyncRoot lock held.

    // Called with SyncRoot lock held.

    public LocalDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,

    public LocalDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,

            Context context, Handler handler, Listener listener) {

            Context context, Handler handler, Listener listener) {
@@ -87,7 +85,6 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
        super(syncRoot, context, handler, listener, TAG);

        super(syncRoot, context, handler, listener, TAG);

        mInjector = injector;

        mInjector = injector;

        mSurfaceControlProxy = mInjector.getSurfaceControlProxy();

        mSurfaceControlProxy = mInjector.getSurfaceControlProxy();

        mIsBootDisplayModeSupported = mSurfaceControlProxy.getBootDisplayModeSupport();

    }

    }





    @Override

    @Override
@@ -352,7 +349,8 @@ final class LocalDisplayAdapter extends DisplayAdapter { 




                if (preferredRecord != null) {

                if (preferredRecord != null) {

                    int preferredModeId = preferredRecord.mMode.getModeId();

                    int preferredModeId = preferredRecord.mMode.getModeId();

                    if (mIsBootDisplayModeSupported && mSystemPreferredModeId != preferredModeId) {

                    if (mSurfaceControlProxy.getBootDisplayModeSupport()

                            && mSystemPreferredModeId != preferredModeId) {

                        mSystemPreferredModeId = preferredModeId;

                        mSystemPreferredModeId = preferredModeId;

                        preferredModeChanged = true;

                        preferredModeChanged = true;

                    }

                    }
@@ -902,7 +900,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
            }

            }

            updateDeviceInfoLocked();

            updateDeviceInfoLocked();





            if (!mIsBootDisplayModeSupported) {

            if (!mSurfaceControlProxy.getBootDisplayModeSupport()) {

                return;

                return;

            }

            }

            if (mUserPreferredModeId == INVALID_MODE_ID) {

            if (mUserPreferredModeId == INVALID_MODE_ID) {