commit 67cc6d174cd284271a7f4ec86588ad3aedd6ea08
author Jason Parks <jparks@google.com> Thu Jun 12 18:16:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 12 18:16:40 2014 +0000
tree edcf28c4db8605797824840506e2bfd5e2f8426d
parent 28caa73d156b678aaf4265f7b752c52c3d9822f4
parent a2c9b1f1d22384ad1a6af86f4eb905abd5f3d343

am a2c9b1f1: am cffcc4ae: Fix the KeyListeners tests.

* commit 'a2c9b1f1d22384ad1a6af86f4eb905abd5f3d343':
  Fix the KeyListeners tests.

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));
     }