Commit 6fbb920f authored by Becky Zhou's avatar Becky Zhou Committed by Commit Bot

Add null check in LocationBarPhone#updateGoogleG

Bug: 843024
Change-Id: I559a2d65f5112724112a0a57b38e4da4ef375bc4
Reviewed-on: https://chromium-review.googlesource.com/1060116Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558813}
parent 4d94d132
...@@ -200,6 +200,9 @@ public class LocationBarPhone extends LocationBarLayout { ...@@ -200,6 +200,9 @@ public class LocationBarPhone extends LocationBarLayout {
} }
private void updateGoogleG() { private void updateGoogleG() {
// Inflation might not be finished yet during startup.
if (mGoogleGContainer == null) return;
// The toolbar data provider can be null during startup, before the ToolbarManager has been // The toolbar data provider can be null during startup, before the ToolbarManager has been
// initialized. // initialized.
ToolbarDataProvider toolbarDataProvider = getToolbarDataProvider(); ToolbarDataProvider toolbarDataProvider = getToolbarDataProvider();
......
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