From 1720e65540c1b10b823bc0a84752f219e229ea8d Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Tue, 2 Aug 2022 13:23:42 +0000 Subject: [PATCH] Add idlemode to BrightnessEvent logging - Add idle mode curve active to the brightness event logging so that it can be debugged more easily - Fix constants so that they do not overlap / cause each other to be true when they shouldn't be Bug: n/a Test: adb shell dumpsys display Change-Id: I255396f132497ba42b60261de1477231520dad3d --- .../server/display/AutomaticBrightnessController.java | 4 +++- .../server/display/brightness/BrightnessEvent.java | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index 114690a033241..a817cea1a6748 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -345,7 +345,9 @@ class AutomaticBrightnessController { brightnessEvent.setFlags(brightnessEvent.getFlags() | (!mAmbientLuxValid ? BrightnessEvent.FLAG_INVALID_LUX : 0) | (mDisplayPolicy == DisplayPowerRequest.POLICY_DOZE - ? BrightnessEvent.FLAG_DOZE_SCALE : 0)); + ? BrightnessEvent.FLAG_DOZE_SCALE : 0) + | (mCurrentBrightnessMapper.isForIdleMode() + ? BrightnessEvent.FLAG_IDLE_CURVE : 0)); } if (!mAmbientLuxValid) { diff --git a/services/core/java/com/android/server/display/brightness/BrightnessEvent.java b/services/core/java/com/android/server/display/brightness/BrightnessEvent.java index 6698612dc6522..d831dbd4bb230 100644 --- a/services/core/java/com/android/server/display/brightness/BrightnessEvent.java +++ b/services/core/java/com/android/server/display/brightness/BrightnessEvent.java @@ -27,8 +27,9 @@ import android.util.TimeUtils; public final class BrightnessEvent { public static final int FLAG_RBC = 0x1; public static final int FLAG_INVALID_LUX = 0x2; - public static final int FLAG_DOZE_SCALE = 0x3; - public static final int FLAG_USER_SET = 0x4; + public static final int FLAG_DOZE_SCALE = 0x4; + public static final int FLAG_USER_SET = 0x8; + public static final int FLAG_IDLE_CURVE = 0x16; private BrightnessReason mReason = new BrightnessReason(); private int mDisplayId; @@ -257,6 +258,7 @@ public final class BrightnessEvent { return ((mFlags & FLAG_USER_SET) != 0 ? "user_set " : "") + ((mFlags & FLAG_RBC) != 0 ? "rbc " : "") + ((mFlags & FLAG_INVALID_LUX) != 0 ? "invalid_lux " : "") - + ((mFlags & FLAG_DOZE_SCALE) != 0 ? "doze_scale " : ""); + + ((mFlags & FLAG_DOZE_SCALE) != 0 ? "doze_scale " : "") + + ((mFlags & FLAG_IDLE_CURVE) != 0 ? "idle_curve " : ""); } }