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

Commit c43f07de authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support Ultra HDR only if the device support setting brightness by... 

Merge "Support Ultra HDR only if the device support setting brightness by SurfaceControl." into main am: ed15607f am: 26be6313

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



Change-Id: Ia8b940501e024db6e82f1c2fa39e02e346e365da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b16e965 26be6313

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

+3 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,9 @@ final class LocalDisplayAdapter extends DisplayAdapter { 


                    void handleHdrSdrNitsChanged(float displayNits, float sdrNits) {

                        final float newHdrSdrRatio;

                        if (displayNits != INVALID_NITS && sdrNits != INVALID_NITS) {

                        if (displayNits != INVALID_NITS && sdrNits != INVALID_NITS

                            && (mBacklightAdapter.mUseSurfaceControlBrightness ||

                                mBacklightAdapter.mForceSurfaceControl)) {

                            // Ensure the ratio stays >= 1.0f as values below that are nonsensical

                            newHdrSdrRatio = Math.max(1.f, displayNits / sdrNits);

                        } else {