commit 0485071cdad328377c9f1f0a9b5e9c7281863049
author Victoria Lease <violets@google.com> Tue May 14 11:28:29 2013 -0700
committer The Android Automerger <android-build@android.com> Wed May 15 16:42:34 2013 -0700
tree d2b91cb403ab5f09c74488bc216b2701371ad4b0
parent e613dace0c338c4269c4267b70afc7f21c112000

fix window focus race in BaseKeyListenerTest

Bug: 8000119
Change-Id: Ib82a8d93328111b1a369da5724e06e4736e48363

tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java

diff --git a/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java
index 2f629d6..a0e03f5 100644
--- a/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java
@@ -21,6 +21,7 @@
 
 import android.app.Activity;
 import android.app.Instrumentation;
+import android.cts.util.PollingCheck;
 import android.os.SystemClock;
 import android.test.ActivityInstrumentationTestCase2;
 import android.text.Editable;
@@ -54,6 +55,12 @@
         mActivity = getActivity();
         mInstrumentation = getInstrumentation();
         mTextView = (TextView) mActivity.findViewById(R.id.keylistener_textview);
+        new PollingCheck(1000) {
+            @Override
+            protected boolean check() {
+                return mTextView.hasWindowFocus();
+            }
+        }.run();
     }
 
     public void testBackspace() {