diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 407b248cee444..5de7846a820ea 100644 --- 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(); } }