Merge "Null-check tooltip view to avoid race condition crash." into sc-dev

2021-06-28 17:09:49 +00:00
parent 53aa2d5bad 8e82c86669
commit 262d5493ed
1 changed files with 6 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -1127,7 +1127,12 @@ public class VolumeDialogImpl implements VolumeDialog,
                    .alpha(0.f)
                    .setStartDelay(0)
                    .setDuration(mDialogHideAnimationDurationMs)
-                    .withEndAction(() -> mODICaptionsTooltipView.setVisibility(INVISIBLE))
+                    .withEndAction(() -> {
+                        // It might have been nulled out by tryToRemoveCaptionsTooltip.
+                        if (mODICaptionsTooltipView != null) {
+                            mODICaptionsTooltipView.setVisibility(INVISIBLE);
+                        }
+                    })
                    .start();
        }
    }