From 1516eb0a395ceae2ac07511951b9af2703aa4d89 Mon Sep 17 00:00:00 2001 From: Sergey Serokurov Date: Tue, 9 Nov 2021 20:42:16 -0800 Subject: [PATCH] Fix bubbles behavior in bedtime mode Bug: 185083022 Test: atest SystemUITests Test: screen recording https://drive.google.com/file/d/1jGHUaGoqtJIFcK439ZFBke_TKKdAGbKL/view?usp=sharing Change-Id: Ida14930e50fb41bc5e2809b2b3127bb581a3bac0 --- .../src/com/android/wm/shell/bubbles/BubbleController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index f7af4e1dd1d12..caa532761f1c5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -1036,10 +1036,9 @@ public class BubbleController { // notification, so that the bubble will be re-created if shouldBubbleUp returns // true. mBubbleData.dismissBubbleWithKey(key, DISMISS_NO_BUBBLE_UP); - } else if (entry != null && mTmpRanking.isBubble() && !isActiveBubble - && !entry.getRanking().isSuspended()) { + } else if (entry != null && mTmpRanking.isBubble() && !isActiveBubble) { entry.setFlagBubble(true); - onEntryUpdated(entry, true /* shouldBubbleUp */); + onEntryUpdated(entry, shouldBubbleUp && !entry.getRanking().isSuspended()); } } }