From 5186b1311da8fc83961c82b4c0a9106c43b9dffc Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Mon, 16 Sep 2019 17:55:48 -0700 Subject: [PATCH] No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks getExpandedBubble checks if the shade is expanded or not and returns null if the shade is expanded, we don't care about that for the display drawn callbacks. Test: manual, have a bubble notification on lockscreen, tap it, note that the bubble is expanded & visible after going through lockscreen Bug: 138461119 Change-Id: I00dff7cd3301db6a2613a947015ac0408b545202 --- .../com/android/systemui/bubbles/BubbleController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java index 94d9ede5c8b13..fb2f177b76bb4 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java @@ -926,7 +926,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi @Override public void onSingleTaskDisplayDrawn(int displayId) { - final Bubble expandedBubble = getExpandedBubble(mContext); + final Bubble expandedBubble = mStackView != null + ? mStackView.getExpandedBubble() + : null; if (expandedBubble != null && expandedBubble.getDisplayId() == displayId) { expandedBubble.setContentVisibility(true); } @@ -934,7 +936,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi @Override public void onSingleTaskDisplayEmpty(int displayId) { - final Bubble expandedBubble = getExpandedBubble(mContext); + final Bubble expandedBubble = mStackView != null + ? mStackView.getExpandedBubble() + : null; if (expandedBubble == null) { return; }