From ab68c9fe72edd8dc457b6ea85cf6edaf1b12491d Mon Sep 17 00:00:00 2001 From: Kriti Dang Date: Wed, 16 Nov 2022 14:18:38 +0100 Subject: Covert the mActiveSfDisplayModeAtStartId to framework mode id. Bug: 213463860 Test: adb shell cmd display get-active-display-mode-at-start 0 returns correct mode Change-Id: I3b7b6d5554b914130b2201af1f643fc726b4b0c4 --- .../core/java/com/android/server/display/LocalDisplayAdapter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 2c2075d33bb9..5a714f59485c 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -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)); } /** -- cgit v1.2.3-59-g8ed1b