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

Merge "Covert the mActiveSfDisplayModeAtStartId to framework mode id."

Browse Source
This commit is contained in:
Kriti Dang
2022-11-18 09:25:28 +00:00
committed by Android (Google) Code Review
parent fe48823538 ab68c9fe72
commit 40f628798e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,7 +209,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {
private int mUserPreferredModeId = INVALID_MODE_ID;
// This is used only for the purpose of testing, to verify if the mode was correct when the
// device started or booted.
private int mActiveDisplayModeAtStartId = INVALID_MODE_ID;
private int mActiveSfDisplayModeAtStartId = INVALID_MODE_ID;
private Display.Mode mUserPreferredMode;
private int mActiveModeId = INVALID_MODE_ID;
private boolean mDisplayModeSpecsInvalid;
@@ -241,7 +241,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {
mSidekickInternal = LocalServices.getService(SidekickInternal.class);
mBacklightAdapter = new BacklightAdapter(displayToken, isFirstDisplay,
mSurfaceControlProxy);
mActiveDisplayModeAtStartId = dynamicInfo.activeDisplayModeId;
mActiveSfDisplayModeAtStartId = dynamicInfo.activeDisplayModeId;
}
@Override
@@ -255,7 +255,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {
*/
@Override
public Display.Mode getActiveDisplayModeAtStartLocked() {
return findMode(mActiveDisplayModeAtStartId);
return findMode(findMatchingModeIdLocked(mActiveSfDisplayModeAtStartId));
}
/**