Merge "[HDR]:UserDisabledHdrTypes is not updated after system reboot" (7c053765) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/DisplayManagerService.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -845,6 +845,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);
		@@ -872,6 +881,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[]