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

Merge "Propagate user preferred mode to SurfaceControl, only if it has changed." into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-25 14:24:54 +00:00
committed by Android (Google) Code Review
parent 0c7f85a13b 622b3a38dc
commit 5a53a49803
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -2463,7 +2463,7 @@ public final class DisplayManagerService extends SystemService {
pw.println(" mMinimumBrightnessCurve=" + mMinimumBrightnessCurve);
if (mUserPreferredMode != null) {
pw.println(mUserPreferredMode);
pw.println(" mUserPreferredMode=" + mUserPreferredMode);
}
pw.println();

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

@@ -884,20 +884,26 @@ final class LocalDisplayAdapter extends DisplayAdapter {
public void setUserPreferredDisplayModeLocked(Display.Mode mode) {
final int oldModeId = getPreferredModeId();
mUserPreferredMode = mode;
if (mode != null && (mode.isRefreshRateSet() ^ mode.isResolutionSet())) {
mUserPreferredMode = findMode(mode.getPhysicalWidth(),
if (mode != null && (mode.isRefreshRateSet() || mode.isResolutionSet())) {
Display.Mode matchingSupportedMode;
matchingSupportedMode = findMode(mode.getPhysicalWidth(),
mode.getPhysicalHeight(), mode.getRefreshRate());
if (matchingSupportedMode != null) {
mUserPreferredMode = matchingSupportedMode;
}
}
mUserPreferredModeId = findUserPreferredModeIdLocked(mode);
if (oldModeId != getPreferredModeId()) {
updateDeviceInfoLocked();
mUserPreferredModeId = findUserPreferredModeIdLocked(mUserPreferredMode);
if (oldModeId == getPreferredModeId()) {
return;
}
updateDeviceInfoLocked();
if (!mSurfaceControlProxy.getBootDisplayModeSupport()) {
return;
}
if (mUserPreferredMode == null) {
if (mUserPreferredModeId == INVALID_MODE_ID) {
mSurfaceControlProxy.clearBootDisplayMode(getDisplayTokenLocked());
} else {
int preferredSfDisplayModeId = findSfDisplayModeIdLocked(