Merge "Fix bubbles behavior in bedtime mode" into sc-v2-dev

This commit is contained in:
Sergey Serokurov
2021-11-10 19:08:36 +00:00
committed by Android (Google) Code Review

View File

@@ -1036,10 +1036,9 @@ public class BubbleController {
// notification, so that the bubble will be re-created if shouldBubbleUp returns // notification, so that the bubble will be re-created if shouldBubbleUp returns
// true. // true.
mBubbleData.dismissBubbleWithKey(key, DISMISS_NO_BUBBLE_UP); mBubbleData.dismissBubbleWithKey(key, DISMISS_NO_BUBBLE_UP);
} else if (entry != null && mTmpRanking.isBubble() && !isActiveBubble } else if (entry != null && mTmpRanking.isBubble() && !isActiveBubble) {
&& !entry.getRanking().isSuspended()) {
entry.setFlagBubble(true); entry.setFlagBubble(true);
onEntryUpdated(entry, true /* shouldBubbleUp */); onEntryUpdated(entry, shouldBubbleUp && !entry.getRanking().isSuspended());
} }
} }
} }