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

Commit b43a22e3 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 79782d7c: Merge "Close context menu dialogs if the menu becomes empty" into klp-dev 

* commit '79782d7c':
  Close context menu dialogs if the menu becomes empty
parents bc16fdc0 79782d7c

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+4 −0
Original line number Diff line number Diff line
@@ -2338,6 +2338,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
                    originalView.getWindowToken());

            if (helper != null) {

                helper.setPresenterCallback(mContextMenuCallback);

            } else if (mContextMenuHelper != null) {

                // No menu to show, but if we have a menu currently showing it just became blank.

                // Close it.

                mContextMenuHelper.dismiss();

            }

            mContextMenuHelper = helper;

            return helper != null;