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

Merge "[HDR]:UserDisabledHdrTypes is not updated after system reboot" am: 7c053765d7

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

Change-Id: Ic5df71b01b5f735c6df12d7ee93714fd05e819c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kriti Dang
2023-01-24 15:02:46 +00:00
committed by Automerger Merge Worker
parent 2c992e02a3 7c053765d7
commit b14ad94325
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -847,6 +847,15 @@ public final class DisplayManagerService extends SystemService {
for (int i = 0; i < userDisabledHdrTypeStrings.length; i++) {
mUserDisabledHdrTypes[i] = Integer.parseInt(userDisabledHdrTypeStrings[i]);
}
if (!mAreUserDisabledHdrTypesAllowed) {
mLogicalDisplayMapper.forEachLocked(
display -> {
display.setUserDisabledHdrTypes(mUserDisabledHdrTypes);
handleLogicalDisplayChangedLocked(display);
});
}
} catch (NumberFormatException e) {
Slog.e(TAG, "Failed to parse USER_DISABLED_HDR_FORMATS. "
+ "Clearing the setting.", e);
@@ -874,6 +883,15 @@ public final class DisplayManagerService extends SystemService {
Settings.Global.USER_PREFERRED_RESOLUTION_WIDTH, Display.INVALID_DISPLAY_WIDTH);
Display.Mode mode = new Display.Mode(width, height, refreshRate);
mUserPreferredMode = isResolutionAndRefreshRateValid(mode) ? mode : null;
if (mUserPreferredMode != null) {
mDisplayDeviceRepo.forEachLocked((DisplayDevice device) -> {
device.setUserPreferredDisplayModeLocked(mode);
});
} else {
mLogicalDisplayMapper.forEachLocked((LogicalDisplay display) -> {
configurePreferredDisplayModeLocked(display);
});
}
}
private DisplayInfo getDisplayInfoForFrameRateOverride(DisplayEventReceiver.FrameRateOverride[]