am 26654274: Merge change 8216 into donut

Merge commit '26654274905961835a36dbcfe98dc745e8beefbf'

* commit '26654274905961835a36dbcfe98dc745e8beefbf':
  Fixes #1994125. Ensures AbsListView's filter window is always dismissed.

core/java/android/widget/AbsListView.java

@@ -1535,6 +1535,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
 
+        // Dismiss the popup in case onSaveInstanceState() was not invoked
+        dismissPopup();
+
         final ViewTreeObserver treeObserver = getViewTreeObserver();
         if (treeObserver != null) {
             treeObserver.removeOnTouchModeChangeListener(this);