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 am: a15b5913e9 am: 52262c70af

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23376769

Change-Id: I8bb06e579679ed8f1159f69c9403bda6c01171f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liran Binyamin
2023-06-05 21:29:52 +00:00
committed by Automerger Merge Worker
@@ -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),