Commit 3070fce9 authored by Cathy Li's avatar Cathy Li Committed by Commit Bot

Fix NPE during NewTabPageLayout destruction.

Null pointer crash is caused by CompositorViewHolder nulled out before onDestroy gets called in some cases.

Bug: 904245
Change-Id: I4a8c3347a2bf7f0af2f704bc2e33cadc4534adc7
Reviewed-on: https://chromium-review.googlesource.com/c/1334273
Commit-Queue: Cathy Li <chili@chromium.org>
Reviewed-by: default avatarTheresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607752}
parent a78d2074
...@@ -910,7 +910,10 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer ...@@ -910,7 +910,10 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
private void onDestroy() { private void onDestroy() {
VrModuleProvider.unregisterVrModeObserver(this); VrModuleProvider.unregisterVrModeObserver(this);
if (mOverviewObserver != null) { // Need to null-check compositor view holder and layout manager since they might've
// been cleared by now.
if (mOverviewObserver != null && mTab.getActivity().getCompositorViewHolder() != null
&& mTab.getActivity().getCompositorViewHolder().getLayoutManager() != null) {
((LayoutManagerChrome) mTab.getActivity().getCompositorViewHolder().getLayoutManager()) ((LayoutManagerChrome) mTab.getActivity().getCompositorViewHolder().getLayoutManager())
.removeOverviewModeObserver(mOverviewObserver); .removeOverviewModeObserver(mOverviewObserver);
mOverviewObserver = null; mOverviewObserver = null;
......
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