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

Commit 40569087 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: I63da823f6cfd16203a3a005578466c6ee26d368c
parents b4f6f16c f594db70

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

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


    private final SurfaceControlProxy mSurfaceControlProxy;



    private final boolean mIsBootDisplayModeSupported;



    // Called with SyncRoot lock held.

    public LocalDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,

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

        mInjector = injector;

        mSurfaceControlProxy = mInjector.getSurfaceControlProxy();

        mIsBootDisplayModeSupported = mSurfaceControlProxy.getBootDisplayModeSupport();

    }



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


                if (preferredRecord != null) {

                    int preferredModeId = preferredRecord.mMode.getModeId();

                    if (mIsBootDisplayModeSupported && mSystemPreferredModeId != preferredModeId) {

                    if (mSurfaceControlProxy.getBootDisplayModeSupport()

                            && mSystemPreferredModeId != preferredModeId) {

                        mSystemPreferredModeId = preferredModeId;

                        preferredModeChanged = true;

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

            updateDeviceInfoLocked();



            if (!mIsBootDisplayModeSupported) {

            if (!mSurfaceControlProxy.getBootDisplayModeSupport()) {

                return;

            }

            if (mUserPreferredModeId == INVALID_MODE_ID) {