Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I521e603941b4989bd5e1f8a7634445ab6bd8583c
This commit is contained in:
TreeHugger Robot
2022-03-08 21:24:28 +00:00
committed by Automerger Merge Worker
parent 853f73c600 f594db70aa
commit d6385cd390
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/display/LocalDisplayAdapter.java
View File

@@ -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) {