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

Commit 2a39aef4 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix crash when removing draw listener"

parents a323e3f3 74a94059

core/java/android/widget/ActionMenuPresenter.java

+4 −3
Original line number Diff line number Diff line
@@ -381,12 +381,13 @@ public class ActionMenuPresenter extends BaseMenuPresenter 
        computeMenuItemAnimationInfo(true);

        final ViewTreeObserver observer = menuViewParent.getViewTreeObserver();

        if (observer != null) {

            observer.addOnDrawListener(new ViewTreeObserver.OnDrawListener() {

            observer.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {

                @Override

                public void onDraw() {

                public boolean onPreDraw() {

                    computeMenuItemAnimationInfo(false);

                    observer.removeOnDrawListener(this);

                    observer.removeOnPreDrawListener(this);

                    runItemAnimations();

                    return true;

                }

            });

        }