Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e0c8c8b authored by Sergey Serokurov's avatar Sergey Serokurov Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16227228

Change-Id: Ic0eec06f3c02f232cbd6db48f8fcab96dd69070c
parents bc4efa5b b13cde5c

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+2 −3
Original line number Diff line number Diff line
@@ -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());

            }

        }

    }