diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-09-19 00:40:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-19 00:40:59 +0000 |
| commit | 4ac6a113ed96ebfca8add7fd8edf4b5aad5cc195 (patch) | |
| tree | a9192a1a6b03d9dd68850fa8cabfa0f185e4f4b5 | |
| parent | c67e4da8718e871e1e8e2c3f938d5206c40fb1ac (diff) | |
| parent | 5186b1311da8fc83961c82b4c0a9106c43b9dffc (diff) | |
Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java | 8 |
1 files 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 94d9ede5c8b1..fb2f177b76bb 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; } |