commit d5d85af4485258a685953d8090f11852240f33fb
author Jason Parks <jparks@google.com> Tue Jun 10 22:33:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 10 22:33:31 2014 +0000
tree c0b05a2ef9b4ff9ffc0ce2264c0dcd9362969cba
parent 96caf772508265bb31ae83534eec5ee6e1a77d78
parent ecbab096115d2e313e4de989e72c157574ed9809

am ecbab096: Merge "Fix flaky test." into klp-modular-dev

* commit 'ecbab096115d2e313e4de989e72c157574ed9809':
  Fix flaky test.

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

diff --git a/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java b/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
index 9d3cbc7..3513281 100644
--- a/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
@@ -30,6 +30,7 @@
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
 
@@ -68,6 +69,9 @@
 
         getInstrumentation().runOnMainSync(new Runnable() {
             public void run() {
+                getActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
+                        WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+                
                 getActivity().setContentView(mTextView);
                 mTextView.setFocusable(true);
                 mTextView.requestFocus();