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

Commit 199336b1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix SurfaceControl.setDisplayBrightness error msg" into sc-dev am: fe4a41f1 

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

Change-Id: I208d29c98cc1adaf61a3af86985cfb2d1b7d787d
parents c406acdd fe4a41f1

core/java/android/view/SurfaceControl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2468,7 +2468,7 @@ public final class SurfaceControl implements Parcelable { 
        if (Float.isNaN(sdrBrightness) || sdrBrightness > 1.0f

        if (Float.isNaN(sdrBrightness) || sdrBrightness > 1.0f

                || (sdrBrightness < 0.0f && sdrBrightness != -1.0f)) {

                || (sdrBrightness < 0.0f && sdrBrightness != -1.0f)) {

            throw new IllegalArgumentException("sdrBrightness must be a number between 0.0f "

            throw new IllegalArgumentException("sdrBrightness must be a number between 0.0f "

                    + "and 1.0f, or -1 to turn the backlight off: " + displayBrightness);

                    + "and 1.0f, or -1 to turn the backlight off: " + sdrBrightness);

        }

        }

        return nativeSetDisplayBrightness(displayToken, sdrBrightness, sdrBrightnessNits,

        return nativeSetDisplayBrightness(displayToken, sdrBrightness, sdrBrightnessNits,

                displayBrightness, displayBrightnessNits);

                displayBrightness, displayBrightnessNits);