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

Commit 82f1cc12 authored by Christine Franks's avatar Christine Franks Committed by Automerger Merge Worker
Browse files

Merge "Skip recalc splines if autobrightness unsupported" into sc-dev am: 8ed86f11 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75a7a29adbfaad71ea3cdc587bb21063845b1d19
parents eb03e584 8ed86f11

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

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.Log;

import android.util.MathUtils;

import android.util.Slog;

import android.util.TimeUtils;
@@ -619,6 +620,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    }



    private void applyReduceBrightColorsSplineAdjustment() {

        if (mBrightnessMapper == null) {

            Log.w(TAG, "No brightness mapping available to recalculate splines");

            return;

        }



        float[] adjustedNits = new float[mNitsRange.length];

        for (int i = 0; i < mNitsRange.length; i++) {

            adjustedNits[i] = mCdsi.getReduceBrightColorsAdjustedBrightnessNits(mNitsRange[i]);