Commit 6d66bf13 authored by Mehran Mahmoudi's avatar Mehran Mahmoudi Committed by Commit Bot

[Paint Preview] Fix crash in animation logic

There's a NullPointerException crash caused when a tab is closed while
paint preview is fading out. This fixes that.

Bug: 1133170
Change-Id: I3d3b025fdc70ea83113c09a054f7120555e51f98
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2437739
Commit-Queue: Mehran Mahmoudi <mahmoudi@chromium.org>
Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
Auto-Submit: Mehran Mahmoudi <mahmoudi@chromium.org>
Reviewed-by: default avatarCalder Kitagawa <ckitagawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811750}
parent 0fdb9cb4
...@@ -243,10 +243,14 @@ public class TabbedPaintPreviewPlayer implements TabViewProvider, UserData { ...@@ -243,10 +243,14 @@ public class TabbedPaintPreviewPlayer implements TabViewProvider, UserData {
.setListener(new AnimatorListenerAdapter() { .setListener(new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
mTab.getTabViewManager().removeTabViewProvider( if (mTab != null) {
TabbedPaintPreviewPlayer.this); mTab.getTabViewManager().removeTabViewProvider(
mPlayerManager.destroy(); TabbedPaintPreviewPlayer.this);
mPlayerManager = null; }
if (mPlayerManager != null) {
mPlayerManager.destroy();
mPlayerManager = null;
}
mFadingOut = false; mFadingOut = false;
} }
}); });
......
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