LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am fd6a2b4d: Merge "Really don\'t send POWER or ENDCALL." into honeycomb

Browse Source 
* commit 'fd6a2b4d2552f4a6179ac6f5f499e48310a8d813':
  Really don't send POWER or ENDCALL.
This commit is contained in:
Ed Heyl
2011-01-20 21:42:01 -08:00
committed by Android Git Automerger
parent 7052e85913 fd6a2b4d25
commit e0dfaf68b4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
View File

@@ -391,7 +391,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]) {
@@ -412,11 +412,12 @@ public class MonkeySourceRandom implements MonkeyEventSource {
lastKey = 1 + mRandom.nextInt(KeyEvent.getMaxKeyCode() - 1); lastKey = 1 + mRandom.nextInt(KeyEvent.getMaxKeyCode() - 1);
} }
if (lastKey == KeyEvent.KEYCODE_POWER || lastKey == KeyEvent.KEYCODE_ENDCALL) { if (lastKey != KeyEvent.KEYCODE_POWER
// Make sure we don't inadvertently turn off the device. && lastKey != KeyEvent.KEYCODE_ENDCALL
continue; && PHYSICAL_KEY_EXISTS[lastKey]) {
break;
} }
} while (!PHYSICAL_KEY_EXISTS[lastKey]); }
MonkeyKeyEvent e = new MonkeyKeyEvent(KeyEvent.ACTION_DOWN, lastKey); MonkeyKeyEvent e = new MonkeyKeyEvent(KeyEvent.ACTION_DOWN, lastKey);
mQ.addLast(e); mQ.addLast(e);