Prevent monkey from turning off the screen. (DO NOT MERGE)

Bug: 3371251
Change-Id: I33005005fadc0f994f39fded10faafe21116f82a

diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
index f1edae1..3d7834c 100644 (file)
--- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
@@ -479,7 +479,7 @@ public class MonkeySourceRandom implements MonkeyEventSource {
         }
 
         // The remaining event categories are injected as key events
-        do {
+        for (;;) {
             if (cls < mFactors[FACTOR_NAV]) {
                 lastKey = NAV_KEYS[mRandom.nextInt(NAV_KEYS.length)];
             } else if (cls < mFactors[FACTOR_MAJORNAV]) {
@@ -499,7 +499,13 @@ public class MonkeySourceRandom implements MonkeyEventSource {
             } else {
                 lastKey = 1 + mRandom.nextInt(KeyEvent.getMaxKeyCode() - 1);
             }
-        } while (!PHYSICAL_KEY_EXISTS[lastKey]);
+
+            if (lastKey != KeyEvent.KEYCODE_POWER
+                    && lastKey != KeyEvent.KEYCODE_ENDCALL
+                    && PHYSICAL_KEY_EXISTS[lastKey]) {
+                break;
+            }
+        }
 
         MonkeyKeyEvent e = new MonkeyKeyEvent(KeyEvent.ACTION_DOWN, lastKey);
         mQ.addLast(e);