commit a40000960701a684ccd6e731a477c962f22c6f15
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 13 11:24:49 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 13 11:24:49 2025 -0700
tree 9de1946187602e92b39dd9847d347694501937da
parent d4e599489d725954d016ecdef14af7b0b13d9247
parent bd9a8433b9892b220d97767bc3b77ce8a6b48d16

Merge "Prevent windows from dimming if host is going away" into main

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

diff --git a/services/core/java/com/android/server/wm/Dimmer.java b/services/core/java/com/android/server/wm/Dimmer.java
index 2798e84..ab87459 100644
--- a/services/core/java/com/android/server/wm/Dimmer.java
+++ b/services/core/java/com/android/server/wm/Dimmer.java
@@ -218,6 +218,11 @@
      */
     protected void adjustAppearance(@NonNull WindowState dimmingContainer,
                                     float alpha, int blurRadius) {
+        if (!mHost.isVisibleRequested()) {
+            // If the host is already going away, there is no point in keeping dimming
+            return;
+        }
+
         if (mDimState != null || (alpha != 0 || blurRadius != 0)) {
             final DimState d = obtainDimState(dimmingContainer);
             d.prepareLookChange(alpha, blurRadius);