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"

Browse Source
This commit is contained in:
Kriti Dang
2023-01-24 14:22:50 +00:00
committed by Gerrit Code Review
parent 255d919f5c 8a6745e902
commit 7c053765d7
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

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