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

Commit b5cfb7f2 authored by Peter Lin's avatar Peter Lin Committed by Automerger Merge Worker
Browse files

Merge "set NBM_FEATURE_FLAG to true." into udc-d1-dev am: dd7c827f 

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



Change-Id: Ie3b3803f922b6cacb11484a0683b50ec11d19441
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0dc656d4 dd7c827f

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

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import java.util.function.BooleanSupplier; 


class BrightnessRangeController {



    private static final boolean NBM_FEATURE_FLAG = false;

    private static final boolean NBM_FEATURE_FLAG = true;



    private final HighBrightnessModeController mHbmController;

    private final NormalBrightnessModeController mNormalBrightnessModeController =
@@ -42,6 +42,7 @@ class BrightnessRangeController { 


    void dump(PrintWriter pw) {

        mHbmController.dump(pw);

        mNormalBrightnessModeController.dump(pw);

    }



    void onAmbientLuxChange(float ambientLux) {

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

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.PowerManager; 


import com.android.server.display.DisplayDeviceConfig.BrightnessLimitMapType;



import java.io.PrintWriter;

import java.util.HashMap;

import java.util.Map;
@@ -41,6 +42,14 @@ class NormalBrightnessModeController { 
        return recalculateMaxBrightness();

    }



    void dump(PrintWriter pw) {

        pw.println("NormalBrightnessModeController:");

        pw.println("  mAutoBrightnessEnabled=" + mAutoBrightnessEnabled);

        pw.println("  mAmbientLux=" + mAmbientLux);

        pw.println("  mMaxBrightness=" + mMaxBrightness);

        pw.println("  mMaxBrightnessLimits=" + mMaxBrightnessLimits);

    }



    boolean setAutoBrightnessState(int state) {

        boolean isEnabled = state == AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED;

        if (isEnabled != mAutoBrightnessEnabled) {