Merge "Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev am: 4ac6a113ed" into qt-qpr1-dev-plus-aosp

am: 834dad1f5b

Change-Id: If679e7fc579a43ce12b68bd742e6ece9da031e3d
This commit is contained in:
Mady Mellor
2019-09-18 18:19:40 -07:00
committed by android-build-merger

View File

@@ -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;
}