commit 54642d141f80d495a475b304052eedd2832fcdb1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 14 11:19:43 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 14 11:19:43 2025 -0700
tree 1e70aa3b54c571ebac52f354baa7c8944e540309
parent 00a0e2def63b6df9ccc80f95f03b1d0586618f87
parent d99084e244b9e528015dcad499314115f9388a6d

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32300717'] into 25Q1-release.

Change-Id: I31e2870696ebd4ab0005ea2b38db7d965226e7a3

services/core/java/com/android/server/wm/RootWindowContainer.java

diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index 46312af..a83b25e 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -882,7 +882,9 @@
         if (!mWmService.mDisplayFrozen) {
             // Post these on a handler such that we don't call into power manager service while
             // holding the window manager lock to avoid lock contention with power manager lock.
-            mHandler.obtainMessage(SET_SCREEN_BRIGHTNESS_OVERRIDE, mDisplayBrightnessOverrides)
+            // Send a copy of the brightness overrides as they may be cleared before being sent out.
+            mHandler.obtainMessage(SET_SCREEN_BRIGHTNESS_OVERRIDE,
+                    mDisplayBrightnessOverrides.clone())
                     .sendToTarget();
             mHandler.obtainMessage(SET_USER_ACTIVITY_TIMEOUT, mUserActivityTimeout).sendToTarget();
         }