From 54c821eb19d7d1f04dc4ec9663d4c45066be0aba Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 17 Dec 2019 11:53:04 -0800
Subject: [PATCH] Avoid initialization race condition

ScrimController#onColorsChanged might arrive before
ScrimController#attachViews, this would cause SysUI to crash loop.

Test: atest ScrimControllerTest
Test: manual
Change-Id: If48cb5f2bfc2251419384e9387590270efe1d787
---
 .../com/android/systemui/statusbar/phone/ScrimController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index b8aea9b2cd59d..4c5bbce052610 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -561,7 +561,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
     }
 
     protected void scheduleUpdate() {
-        if (mUpdatePending) return;
+        if (mUpdatePending || mScrimBehind == null) return;
 
         // Make sure that a frame gets scheduled.
         mScrimBehind.invalidate();