From 713c22ed8c87bd5ecdc59175ea0a17e19ccb48cf Mon Sep 17 00:00:00 2001
From: Steven Liu <steveliu@google.com>
Date: Tue, 8 Mar 2022 19:21:51 +0000
Subject: [PATCH] Revert "Call SurfaceControl.getBootDisplayModeSupport only
 one time"

This reverts commit 96f11eedc0074a9ef97bd40fef254be10ff30a8e.

Reason for revert: <test break, see b/223401286>

Change-Id: I930e3077c27a261d280ad145791c9096a9c6409e
---
 .../com/android/server/display/LocalDisplayAdapter.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 540ae8165dbd9..7a0cf4b592e78 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -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) {