From f083bd43a0c6b7bf1b88775ac0f1d0bec1281a75 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Tue, 2 Nov 2010 15:53:10 -0700 Subject: [PATCH] Monkey updates for new keyboard features. Add the new volume mute key as a system key. Use virtual keyboard during injection. Also fixed a deprecation warning for using an old Intent API. Bug: 2912307 Bug: 3221301 Change-Id: I056844509112727aa3541223f090cc500c55fc41 --- .../src/com/android/commands/monkey/MonkeyActivityEvent.java | 5 ++--- .../src/com/android/commands/monkey/MonkeySourceNetwork.java | 2 +- .../src/com/android/commands/monkey/MonkeySourceRandom.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java b/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java index 262377a9f..4661d8cc5 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.RemoteException; import android.view.IWindowManager; -import android.util.Log; /** * monkey activity event @@ -57,7 +56,7 @@ public class MonkeyActivityEvent extends MonkeyEvent { public int injectEvent(IWindowManager iwm, IActivityManager iam, int verbose) { Intent intent = getEvent(); if (verbose > 0) { - System.out.println(":Switch: " + intent.toURI()); + System.out.println(":Switch: " + intent.toUri(0)); } if (mAlarmTime != 0){ @@ -75,7 +74,7 @@ public class MonkeyActivityEvent extends MonkeyEvent { } catch (SecurityException e) { if (verbose > 0) { System.out.println("** Permissions error starting activity " - + intent.toURI()); + + intent.toUri(0)); } return MonkeyEvent.INJECT_ERROR_SECURITY_EXCEPTION; } diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetwork.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetwork.java index a9a1db416..dbd616af1 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetwork.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetwork.java @@ -294,7 +294,7 @@ public class MonkeySourceNetwork implements MonkeyEventSource { // Convert the string to an array of KeyEvent's for // the built in keymap. KeyCharacterMap keyCharacterMap = KeyCharacterMap. - load(KeyCharacterMap.BUILT_IN_KEYBOARD); + load(KeyCharacterMap.VIRTUAL_KEYBOARD); KeyEvent[] events = keyCharacterMap.getEvents(chars); // enqueue all the events we just got. diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java index a2fa7326a..ab785632b 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java @@ -48,7 +48,7 @@ public class MonkeySourceRandom implements MonkeyEventSource { private static final int[] SYS_KEYS = { KeyEvent.KEYCODE_HOME, KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_CALL, KeyEvent.KEYCODE_ENDCALL, - KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, + KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE, KeyEvent.KEYCODE_MUTE, }; /** If a physical key exists? */