From 45b2e9797cafb84067b6d55ad7c0233865938341 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Fri, 21 May 2021 14:33:01 +0200
Subject: [PATCH] Make sure to always fade the split shade media container

When only fading while gone, it could lead to issues
when fading out during non-split shade, especially during
initial initialization. As there's an inherent race,
we instead fade the host always, regardless if it's GONE,
as this doesn't have any negative side effects.

Fixes: 188884830
Test: follow steps on bug, observe no issue
Change-Id: I54813a8f153713ff558409b67cd515c605afe9e3
---
 .../SystemUI/src/com/android/keyguard/KeyguardStatusView.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
index 3ab2cca09a292..299ecebd021c2 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
@@ -228,9 +228,7 @@ public class KeyguardStatusView extends GridLayout {
         }
         mDarkAmount = darkAmount;
         mClockView.setDarkAmount(darkAmount);
-        if (mMediaHostContainer.getVisibility() != View.GONE) {
-            CrossFadeHelper.fadeOut(mMediaHostContainer, darkAmount);
-        }
+        CrossFadeHelper.fadeOut(mMediaHostContainer, darkAmount);
         updateDark();
     }