Merge "Skip ListPopupWindow position update if detached"

2017-03-23 14:17:28 +00:00
parent 302b7a7075 a31d4edb74
commit c45b10a9cb
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/widget/ListPopupWindow.java
+++ b/core/java/android/widget/ListPopupWindow.java
@ -600,6 +600,10 @@ public class ListPopupWindow implements ShowableListMenu {
        mPopup.setWindowLayoutType(mDropDownWindowLayoutType);

        if (mPopup.isShowing()) {
+            if (!getAnchorView().isAttachedToWindow()) {
+                //Don't update position if the anchor view is detached from window.
+                return;
+            }
            final int widthSpec;
            if (mDropDownWidth == ViewGroup.LayoutParams.MATCH_PARENT) {
                // The call to PopupWindow's update method below can accept -1 for any