From b9ae68b158ea9b91d4d4fa5ce8afacbefd884cb4 Mon Sep 17 00:00:00 2001 From: Peter Lin Date: Sat, 22 Jul 2023 00:19:52 +0000 Subject: set NBM_FEATURE_FLAG to true. Turned the split lux-limited brightness feature on. Bug: 290636893 test: check the mMaxBrightnessLimits data Change-Id: Ibfe0a6a459f09b63e49965847d254be508b9daa4 Merged-In: I88b4e5dfd16b1efbe87bf21459755ff2b4900d1f --- .../com/android/server/display/BrightnessRangeController.java | 3 ++- .../android/server/display/NormalBrightnessModeController.java | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/display/BrightnessRangeController.java b/services/core/java/com/android/server/display/BrightnessRangeController.java index 00564963fac3..5ca296153783 100644 --- a/services/core/java/com/android/server/display/BrightnessRangeController.java +++ b/services/core/java/com/android/server/display/BrightnessRangeController.java @@ -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) { diff --git a/services/core/java/com/android/server/display/NormalBrightnessModeController.java b/services/core/java/com/android/server/display/NormalBrightnessModeController.java index dbabc2441224..bd5ed23d4782 100644 --- a/services/core/java/com/android/server/display/NormalBrightnessModeController.java +++ b/services/core/java/com/android/server/display/NormalBrightnessModeController.java @@ -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) { -- cgit v1.2.3-59-g8ed1b