Merge "Fix for b 2558942" into froyo
diff --git a/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java b/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
index 5bfce3a..a8c9ae0 100644
--- a/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
@@ -685,35 +685,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        method = "onWindowFocusChanged",
-        args = {boolean.class}
-    )
-    @UiThreadTest
-    public void testOnWindowFocusChanged() {
-        mAutoCompleteTextView.setText(STRING_TEST);
-        windowfocusChange(true);
-        assertEquals(STRING_VALIDATED, mAutoCompleteTextView.getText().toString());
-        assertTrue(mAutoCompleteTextView.isPopupShowing());
-        mAutoCompleteTextView.setValidator(null);
-
-        // If hasWindowFocus has been set as false, popup window will be closed.
-        windowfocusChange(false);
-        assertEquals(STRING_VALIDATED, mAutoCompleteTextView.getText().toString());
-        mAutoCompleteTextView.setValidator(null);
-        assertFalse(mAutoCompleteTextView.isPopupShowing());
-    }
-
-    @UiThreadTest
-    private void windowfocusChange(final Boolean hasWindowFocus) {
-        mAutoCompleteTextView.setValidator(mValidator);
-        mAutoCompleteTextView.setAdapter((ArrayAdapter<String>) null);
-        mAutoCompleteTextView.showDropDown();
-        mAutoCompleteTextView.setText(STRING_TEST);
-        mAutoCompleteTextView.onWindowFocusChanged(hasWindowFocus);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
         method = "performValidation",
         args = {}
     )