diff options
| author | Peter Lin <linpeter@google.com> | 2023-07-22 00:19:52 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-07 07:29:08 +0000 |
| commit | eeab6b66e4f0fa2e22d256a29b9c3806f5960298 (patch) | |
| tree | e251a1873cfdc0c4d34438e628d14ce07489a605 | |
| parent | 3179481974a2bab90c07d745ca28940b9d5ef266 (diff) | |
| download | base-eeab6b66e4f0fa2e22d256a29b9c3806f5960298.tar.gz | |
set NBM_FEATURE_FLAG to true.
Turned the split lux-limited brightness feature on.
Bug: 290636893
test: check the mMaxBrightnessLimits data
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b9ae68b158ea9b91d4d4fa5ce8afacbefd884cb4)
Merged-In: Ibfe0a6a459f09b63e49965847d254be508b9daa4
Change-Id: Ibfe0a6a459f09b63e49965847d254be508b9daa4
| -rw-r--r-- | services/core/java/com/android/server/display/BrightnessRangeController.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/display/NormalBrightnessModeController.java | 9 |
2 files changed, 11 insertions, 1 deletions
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) { |