am 4e10483d: am 6bc7cacf: Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev

* commit '4e10483de3a28041e1108633752581cb0fc77483':
  Fix NPE in PopupMenu.getDragToOpenListener()

1 files changed, 13 insertions, 0 deletions

diff --git a/core/java/android/widget/PopupMenu.java b/core/java/android/widget/PopupMenu.java
index 603db70fad5e..9ac6a5969dea 100644
--- a/core/java/android/widget/PopupMenu.java
+++ b/core/java/android/widget/PopupMenu.java
@@ -93,7 +93,20 @@ public class PopupMenu implements MenuBuilder.Callback, MenuPresenter.Callback {
         if (mDragListener == null) {
             mDragListener = new ForwardingListener(mAnchor) {
                 @Override
+                protected boolean onForwardingStarted() {
+                    show();
+                    return true;
+                }
+
+                @Override
+                protected boolean onForwardingStopped() {
+                    dismiss();
+                    return true;
+                }
+
+                @Override
                 public ListPopupWindow getPopup() {
+                    // This will be null until show() is called.
                     return mPopup.getPopup();
                 }
             };