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

Commit 514e43a6 authored by Shen Lin's avatar Shen Lin
Browse files

Change mODICaptionsTooltipView null check occasion to avoid potential crash 

Null check before a runnable can not guarantee a non-null
mODICaptionsTooltipView when it starts running. This CL switched the
null check occasion to fix it.

Fixes: 266980616
Test: manual, atest
Change-Id: I3c83e775a7fd278dc255242518412ba790625fdb
parent b3238fc8

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

+8 −8
Original line number Diff line number Diff line
@@ -1128,13 +1128,13 @@ public class VolumeDialogImpl implements VolumeDialog, 
            rescheduleTimeoutH();

        }



        if (mODICaptionsTooltipView != null) {

            mODICaptionsTooltipView.setAlpha(0.0f);



        // We need to wait for layout and then center the caption view. Since the height of the

        // dialog is now dynamic (with the variable ringer drawer height changing the height of

        // the dialog), we need to do this here in code vs. in XML.

        mHandler.post(() -> {

            if (mODICaptionsTooltipView != null) {

                mODICaptionsTooltipView.setAlpha(0.0f);



                final int[] odiTooltipLocation = mODICaptionsTooltipView.getLocationOnScreen();

                final int[] odiButtonLocation = mODICaptionsIcon.getLocationOnScreen();
@@ -1160,8 +1160,8 @@ public class VolumeDialogImpl implements VolumeDialog, 
                            }

                        })

                        .start();

            });

            }

        });

    }



    private void hideCaptionsTooltip() {