From 887527429d207f53df9c45ade98b98afbee61710 Mon Sep 17 00:00:00 2001 From: Yu Shan Emily Lau Date: Wed, 2 Nov 2011 20:24:12 -0700 Subject: [PATCH] do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch Change-Id: I21f83b96afc5c3a00a6570e8284adc23191b6dd2 --- .../commands/monkey/MonkeySourceScript.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceScript.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceScript.java index a9a06096c..4748a25c2 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceScript.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceScript.java @@ -492,14 +492,26 @@ public class MonkeySourceScript implements MonkeyEventSource { String cl_name = "com.google.android.powerutil.WakeUpScreen"; long deviceSleepTime = mDeviceSleepTime; + //Start the wakeUpScreen test activity to turn off the screen. ComponentName mApp = new ComponentName(pkg_name, cl_name); - MonkeyActivityEvent e1 = new MonkeyActivityEvent(mApp, deviceSleepTime); - mQ.addLast(e1); + mQ.addLast(new MonkeyActivityEvent(mApp, deviceSleepTime)); + + //inject the special key for the wakeUpScreen test activity. + mQ.addLast(new MonkeyKeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0)); + mQ.addLast(new MonkeyKeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_0)); //Add the wait event after the device sleep event so that the monkey //can continue after the device wake up. - MonkeyWaitEvent e2 = new MonkeyWaitEvent(deviceSleepTime + 3000); - mQ.addLast(e2); + mQ.addLast(new MonkeyWaitEvent(deviceSleepTime + 3000)); + + //Insert the menu key to unlock the screen + mQ.addLast(new MonkeyKeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MENU)); + mQ.addLast(new MonkeyKeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MENU)); + + //Insert the back key to dismiss the test activity + mQ.addLast(new MonkeyKeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK)); + mQ.addLast(new MonkeyKeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK)); + return; }