From cc30c17347308af647f413294aaf2dc9355abe8c Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Tue, 17 Aug 2021 21:46:10 -0400
Subject: [PATCH] Check for forceVisible when updating from a new status event

In the case where we get a status event update that doesn't trigger a
new scheduled event, we also need to check to see if the forceVisible
bit flipped, otherwise we will fail to show the persistent dot.

Bug: 197025130
Test: manual
Change-Id: I261bce40e0a4525e7d1302a983c5fb4622ddc6e2
---
 .../statusbar/events/SystemStatusAnimationScheduler.kt       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt
index f1610d866f343..dcf8e739a76e1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt
@@ -114,6 +114,10 @@ class SystemStatusAnimationScheduler @Inject constructor(
                 Log.d(TAG, "updating current event from: $event")
             }
             scheduledEvent?.updateFromEvent(event)
+            if (event.forceVisible) {
+                hasPersistentDot = true
+                notifyTransitionToPersistentDot()
+            }
         } else {
             if (DEBUG) {
                 Log.d(TAG, "ignoring event $event")
@@ -154,6 +158,7 @@ class SystemStatusAnimationScheduler @Inject constructor(
         // If animations are turned off, we'll transition directly to the dot
         if (!event.showAnimation && event.forceVisible) {
             notifyTransitionToPersistentDot()
+            scheduledEvent = null
             return
         }