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

Commit a15b5913 authored by Liran Binyamin's avatar Liran Binyamin Committed by Android (Google) Code Review
Browse files

Merge "Don't create the bubble bar controllers if the bubble bar view does not... 

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
parents db51eeff 5cc006da

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+1 −1
Original line number Diff line number Diff line
@@ -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),