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

Merge "Call SurfaceControl.getBootDisplayModeSupport only one time" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-08 15:02:18 +00:00
committed by Android (Google) Code Review
parent ff213ef74a 96f11eedc0
commit 3a4d5cf683
1 changed files with 5 additions and 3 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,6 +73,8 @@ 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) {
@@ -85,6 +87,7 @@ 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
@@ -349,8 +352,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {
if (preferredRecord != null) { if (preferredRecord != null) {
int preferredModeId = preferredRecord.mMode.getModeId(); int preferredModeId = preferredRecord.mMode.getModeId();
if (mSurfaceControlProxy.getBootDisplayModeSupport() if (mIsBootDisplayModeSupported && mSystemPreferredModeId != preferredModeId) {
&& mSystemPreferredModeId != preferredModeId) {
mSystemPreferredModeId = preferredModeId; mSystemPreferredModeId = preferredModeId;
preferredModeChanged = true; preferredModeChanged = true;
} }
@@ -900,7 +902,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {
} }
updateDeviceInfoLocked(); updateDeviceInfoLocked();
if (!mSurfaceControlProxy.getBootDisplayModeSupport()) { if (!mIsBootDisplayModeSupported) {
return; return;
} }
if (mUserPreferredModeId == INVALID_MODE_ID) { if (mUserPreferredModeId == INVALID_MODE_ID) {