Merge "Skip ListPopupWindow position update if detached" am: c45b10a9cb

am: 3107a17ba7

Change-Id: I9f2f95841e32aa49e4cb80fa57d34f55594931b3

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/widget/ListPopupWindow.java b/core/java/android/widget/ListPopupWindow.java
index 6a10743c1c56..203b8dd7fc40 100644
--- 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