commit 5811fbd367ae1b56346b198e857cafca96fe7768
author Piotr Wilczyński <wilczynskip@google.com> Thu Jan 05 10:06:48 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 05 10:06:48 2023 +0000
tree d245bfa44907c751f868c582a19b52f0959629f7
parent 83844dfc2a2af116ef07c37ca814ef5f34db3100
parent e77d2cbbc32377e4d1836a5d2a9706b831affb32

Merge "Dump screen off brightness sensor controller" into tm-qpr-dev

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

diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 132d5ec..b43d830 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -2753,6 +2753,10 @@
             dumpBrightnessEvents(pw);
         }
 
+        if (mScreenOffBrightnessSensorController != null) {
+            mScreenOffBrightnessSensorController.dump(pw);
+        }
+
         if (mHbmController != null) {
             mHbmController.dump(pw);
         }

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

diff --git a/services/core/java/com/android/server/display/ScreenOffBrightnessSensorController.java b/services/core/java/com/android/server/display/ScreenOffBrightnessSensorController.java
index 4d394c2..42defac 100644
--- a/services/core/java/com/android/server/display/ScreenOffBrightnessSensorController.java
+++ b/services/core/java/com/android/server/display/ScreenOffBrightnessSensorController.java
@@ -113,7 +113,7 @@
 
     /** Dump current state */
     public void dump(PrintWriter pw) {
-        pw.println("ScreenOffBrightnessSensorController:");
+        pw.println("Screen Off Brightness Sensor Controller:");
         IndentingPrintWriter idpw = new IndentingPrintWriter(pw);
         idpw.increaseIndent();
         idpw.println("registered=" + mRegistered);