From 1c835f0bfbdeeb5c69ee5c992232098adc1d11a9 Mon Sep 17 00:00:00 2001
From: Rupesh Bansal <brup@google.com>
Date: Thu, 23 Feb 2023 08:47:37 +0000
Subject: [PATCH] Fix the issue of null previous brightness reason in the logs

Bug: 268459499
Test: Manually verified the logs are now as expected
Change-Id: I88a8be939d15d60d9e90df62909fa9b0031ca199
---
 .../com/android/server/display/DisplayPowerController2.java     | 1 +
 .../com/android/server/display/brightness/BrightnessEvent.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java
index 204e3c0f923c6..f49419cf789ea 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController2.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController2.java
@@ -1148,6 +1148,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
         final int previousPolicy;
         boolean mustInitialize = false;
         int brightnessAdjustmentFlags = 0;
+        mBrightnessReasonTemp.set(null);
         mTempBrightnessEvent.reset();
         SparseArray<DisplayPowerControllerInterface> displayBrightnessFollowers;
         synchronized (mLock) {
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 8b09571fe9206..aff80de0011db 100644
--- a/services/core/java/com/android/server/display/brightness/BrightnessEvent.java
+++ b/services/core/java/com/android/server/display/brightness/BrightnessEvent.java
@@ -100,7 +100,7 @@ public final class BrightnessEvent {
      * A utility to reset the BrightnessEvent to default values
      */
     public void reset() {
-        mReason.set(null);
+        mReason = new BrightnessReason();
         mTime = SystemClock.uptimeMillis();
         mPhysicalDisplayId = "";
         // Lux values