Merge "Fix ListView filter popups when window focus changes"

1 files changed, 1 insertions, 2 deletions

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index ae4d4099ed8e..a1c3fa210f75 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -1641,7 +1641,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                 mResurrectToPosition = mSelectedPosition;
             }
         } else {
-            if (mFiltered) {
+            if (mFiltered && !mPopupHidden) {
                 // Show the type filter only if a filter is in effect
                 showPopup();
             }
@@ -3510,7 +3510,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
         if (mPopup != null) {
             mPopup.dismiss();
         }
-        mPopupHidden = false;
     }
 
     /**