commit cffcc4ae9c3c7a8fc8b0529845bbaf411be8fa19
author Jason Parks <jparks@google.com> Thu Jun 12 12:13:51 2014 -0500
committer Jason Parks <jparks@google.com> Thu Jun 12 12:13:51 2014 -0500
tree 4aae4593fca093ccc0657d63aea5bf9e085a56a1
parent da5ae67cfe27e8129dd057bf7566ba7b3d1fde70

Fix the KeyListeners tests.

Change-Id: Id2c34da004860a330c22d54f90dc8819940661f4

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

diff --git a/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java b/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
index ef3d751..375ea54 100644
--- a/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
+++ b/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
@@ -64,8 +64,12 @@
         mInstrumentation = getInstrumentation();
         mTextView = (TextView) mActivity.findViewById(R.id.keylistener_textview);
 
-        mActivity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
-                WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        mActivity.runOnUiThread(new Runnable() {
+            public void run() {
+                // Ensure that the screen is on for this test.
+                mTextView.setKeepScreenOn(true);
+            }
+        });
 
         assertTrue(mActivity.waitForWindowFocus(5 * DateUtils.SECOND_IN_MILLIS));
     }