am 98ab3219: Prevent monkey from turning off the screen. (DO NOT MERGE)

* commit '98ab321927f1ea9ebb7ba6b5506ac6748b005555':
  Prevent monkey from turning off the screen. (DO NOT MERGE)
This commit is contained in:
Jeff Brown
2011-01-20 21:46:27 -08:00
committed by Android Git Automerger

View File

@@ -479,7 +479,7 @@ public class MonkeySourceRandom implements MonkeyEventSource {
} }
// The remaining event categories are injected as key events // The remaining event categories are injected as key events
do { for (;;) {
if (cls < mFactors[FACTOR_NAV]) { if (cls < mFactors[FACTOR_NAV]) {
lastKey = NAV_KEYS[mRandom.nextInt(NAV_KEYS.length)]; lastKey = NAV_KEYS[mRandom.nextInt(NAV_KEYS.length)];
} else if (cls < mFactors[FACTOR_MAJORNAV]) { } else if (cls < mFactors[FACTOR_MAJORNAV]) {
@@ -499,7 +499,13 @@ public class MonkeySourceRandom implements MonkeyEventSource {
} else { } else {
lastKey = 1 + mRandom.nextInt(KeyEvent.getMaxKeyCode() - 1); 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); MonkeyKeyEvent e = new MonkeyKeyEvent(KeyEvent.ACTION_DOWN, lastKey);
mQ.addLast(e); mQ.addLast(e);