Merge "Don't create the bubble bar controllers if the bubble bar view does not exist. This fixes a crash that happens when changing navigation modes." into udc-qpr-dev

This commit is contained in:
Liran Binyamin
2023-06-05 18:21:43 +00:00
committed by Android (Google) Code Review
@@ -217,7 +217,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
// If Bubble bar is present, TaskbarControllers depends on it so build it first.
Optional<BubbleControllers> bubbleControllersOptional = Optional.empty();
if (BubbleBarController.BUBBLE_BAR_ENABLED) {
if (BubbleBarController.BUBBLE_BAR_ENABLED && bubbleBarView != null) {
bubbleControllersOptional = Optional.of(new BubbleControllers(
new BubbleBarController(this, bubbleBarView),
new BubbleBarViewController(this, bubbleBarView),