Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b14ad943 authored by Kriti Dang's avatar Kriti Dang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ic5df71b01b5f735c6df12d7ee93714fd05e819c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c992e02 7c053765

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

+18 −0
Original line number Diff line number Diff line
@@ -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[]