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

* commit '79782d7ced41f548a9eac57473bd93faa4aba8b1':
  Close context menu dialogs if the menu becomes empty

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

@@ -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;