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

Commit b05b0b65 authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Android (Google) Code Review
Browse files

Merge "Fix brightness modifier HDR" into main

parents 05c02ca5 d3b96596

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

+1 −0
Original line number Diff line number Diff line
@@ -1958,6 +1958,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                // We want to scale HDR brightness level with the SDR level, we also need to restore

                // SDR brightness immediately when entering dim or low power mode.

                animateValue = mBrightnessRangeController.getHdrBrightnessValue();

                mBrightnessReasonTemp.addModifier(BrightnessReason.MODIFIER_HDR);

            }



            final float currentBrightness = mPowerState.getScreenBrightness();

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

+1 −0
Original line number Diff line number Diff line
@@ -1564,6 +1564,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                // SDR brightness immediately when entering dim or low power mode.

                animateValue = mBrightnessRangeController.getHdrBrightnessValue();

                customTransitionRate = mBrightnessRangeController.getHdrTransitionRate();

                mBrightnessReasonTemp.addModifier(BrightnessReason.MODIFIER_HDR);

            }



            final float currentBrightness = mPowerState.getScreenBrightness();