From fb7ed107356a66a55f003a43a7acc2fdbed1e9c2 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Tue, 7 Jul 2009 15:18:30 -0700
Subject: [PATCH] Fixes #1748951. Calling setListSelection() explicitely should
 cancel the selection hidden flag.

---
 core/java/android/widget/AutoCompleteTextView.java              | 1 +
 .../tests/src/android/widget/AutoCompleteTextViewPopup.java     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java
index 218238419e20f..675aba23ae812 100644
--- a/core/java/android/widget/AutoCompleteTextView.java
+++ b/core/java/android/widget/AutoCompleteTextView.java
@@ -837,6 +837,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
      */
     public void setListSelection(int position) {
         if (mPopup.isShowing() && (mDropDownList != null)) {
+            mDropDownList.mListSelectionHidden = false;
             mDropDownList.setSelection(position);
             // ListView.setSelection() will call requestLayout()
         }
diff --git a/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java b/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java
index 6f89fce71dd81..5ae960a2d2318 100644
--- a/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java
+++ b/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java
@@ -18,6 +18,7 @@ package android.widget;
 
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
+import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
 /**
@@ -149,6 +150,7 @@ public class AutoCompleteTextViewPopup
     }
     
     /** Test the show/hide behavior of the drop-down. */
+    @FlakyTest(tolerance=5)
     @MediumTest
     public void testPopupShow() throws Throwable {
         AutoCompleteTextViewSimple theActivity = getActivity();