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

Commit dd7c827f authored by Peter Lin's avatar Peter Lin Committed by Android (Google) Code Review
Browse files

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

parents 19929470 b9ae68b1

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

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




class BrightnessRangeController {

class BrightnessRangeController {





    private static final boolean NBM_FEATURE_FLAG = false;

    private static final boolean NBM_FEATURE_FLAG = true;





    private final HighBrightnessModeController mHbmController;

    private final HighBrightnessModeController mHbmController;

    private final NormalBrightnessModeController mNormalBrightnessModeController =

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




    void dump(PrintWriter pw) {

    void dump(PrintWriter pw) {

        mHbmController.dump(pw);

        mHbmController.dump(pw);

        mNormalBrightnessModeController.dump(pw);

    }

    }





    void onAmbientLuxChange(float ambientLux) {

    void onAmbientLuxChange(float ambientLux) {

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

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




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

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





import java.io.PrintWriter;

import java.util.HashMap;

import java.util.HashMap;

import java.util.Map;

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

        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 setAutoBrightnessState(int state) {

        boolean isEnabled = state == AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED;

        boolean isEnabled = state == AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED;

        if (isEnabled != mAutoBrightnessEnabled) {

        if (isEnabled != mAutoBrightnessEnabled) {