Commit b8ec43bd authored by Matt Jones's avatar Matt Jones Committed by Commit Bot

Make sure the Contextual Search supplier is non-null

After migrating contextual search scene-related logic out of
LayoutManager in http://crrev.com/c/2456634, it is possible for the
manager to be null. This patch adds a check for that case.

Bug: 1139765
Change-Id: I80c5c326a3a31dcfee378241f794c5860eac5370
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2484932Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818484}
parent 1320ac55
...@@ -229,7 +229,9 @@ public class RootUiCoordinator ...@@ -229,7 +229,9 @@ public class RootUiCoordinator
if (layout instanceof StaticLayout || layout instanceof SimpleAnimationLayout) { if (layout instanceof StaticLayout || layout instanceof SimpleAnimationLayout) {
return; return;
} }
mContextualSearchManagerSupplier.get().dismissContextualSearchBar(); if (mContextualSearchManagerSupplier.get() != null) {
mContextualSearchManagerSupplier.get().dismissContextualSearchBar();
}
} }
@Override @Override
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment