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

Commit 7ee2b0cf authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Fix Walleye dim brightness curves" into rvc-dev am: 0f8da631... 

Merge "Merge "Fix Walleye dim brightness curves" into rvc-dev am: 0f8da631 am: eda3a8c8 am: ebed5ac5" into rvc-qpr-dev-plus-aosp am: 5201f0ea

Change-Id: I4ff02986985b293f3ae6c6dd5a1a241edc9b6e5f
parents d2761b04 5201f0ea

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ import android.util.Pair; 
import android.util.Slog;

import android.util.Slog;

import android.util.Spline;

import android.util.Spline;





import com.android.internal.BrightnessSynchronizer;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;

import com.android.internal.util.Preconditions;

import com.android.server.display.utils.Plog;

import com.android.server.display.utils.Plog;
@@ -347,10 +346,11 @@ public abstract class BrightnessMappingStrategy { 
        }

        }

    }

    }





    // Normalize entire brightness range to 0 - 1.

    protected static float normalizeAbsoluteBrightness(int brightness) {

    protected static float normalizeAbsoluteBrightness(int brightness) {

        return BrightnessSynchronizer.brightnessIntToFloat(brightness,

        brightness = MathUtils.constrain(brightness,

                PowerManager.BRIGHTNESS_OFF + 1, PowerManager.BRIGHTNESS_ON,

                PowerManager.BRIGHTNESS_OFF, PowerManager.BRIGHTNESS_ON);

                PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX);

        return (float) brightness / PowerManager.BRIGHTNESS_ON;

    }

    }





    private Pair<float[], float[]> insertControlPoint(

    private Pair<float[], float[]> insertControlPoint(