Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ee57023 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15128610

Change-Id: Ib590473372d22c19e073cf4d25438f8118eb1417
parents acb2581c 262d5493

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+6 −1
Original line number Diff line number Diff line
@@ -1134,7 +1134,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();

        }

    }