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

am 34ca4b64: Merge "Add the support for the alarmManager and force the device to wake up." into froyo

Browse Source 
Merge commit '34ca4b646b20cc209b06fec482e6c77dbc92d220' into gingerbread

* commit '34ca4b646b20cc209b06fec482e6c77dbc92d220':
  Add the support for the alarmManager and force the device to wake up.
This commit is contained in:
Yu Shan Emily Lau
2010-07-08 11:31:07 -07:00
committed by Android Git Automerger
parent d15a18bdd2 34ca4b646b
commit ec87ca5f3a
2 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java
View File

@@ -19,23 +19,32 @@ package com.android.commands.monkey;
import android.app.IActivityManager; import android.app.IActivityManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.util.Log;
/** /**
* monkey activity event * monkey activity event
*/ */
public class MonkeyActivityEvent extends MonkeyEvent { public class MonkeyActivityEvent extends MonkeyEvent {
private ComponentName mApp; private ComponentName mApp;
String mAlarmTime;
public MonkeyActivityEvent(ComponentName app) { public MonkeyActivityEvent(ComponentName app) {
super(EVENT_TYPE_ACTIVITY); super(EVENT_TYPE_ACTIVITY);
mApp = app; mApp = app;
} }
/** public MonkeyActivityEvent(ComponentName app, String arg) {
super(EVENT_TYPE_ACTIVITY);
mApp = app;
mAlarmTime = arg;
}
/**
* @return Intent for the new activity * @return Intent for the new activity
*/ */
private Intent getEvent() { private Intent getEvent() {
Intent intent = new Intent(Intent.ACTION_MAIN); Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(Intent.CATEGORY_LAUNCHER); intent.addCategory(Intent.CATEGORY_LAUNCHER);
@@ -50,6 +59,13 @@ public class MonkeyActivityEvent extends MonkeyEvent {
if (verbose > 0) { if (verbose > 0) {
System.out.println(":Switch: " + intent.toURI()); System.out.println(":Switch: " + intent.toURI());
} }
if (mAlarmTime != null){
Bundle args = new Bundle();
args.putString("alarmTime", mAlarmTime);
intent.putExtras(args);
}
try { try {
iam.startActivity(null, intent, null, null, 0, null, null, 0, iam.startActivity(null, intent, null, null, 0, null, null, 0,
false, false); false, false);

19
cmds/monkey/src/com/android/commands/monkey/MonkeySourceScript.java
View File

@@ -27,6 +27,7 @@ import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Random; import java.util.Random;
import android.util.Log;
/** /**
* monkey event queue. It takes a script to produce events sample script format: * monkey event queue. It takes a script to produce events sample script format:
@@ -271,12 +272,24 @@ public class MonkeySourceScript implements MonkeyEventSource {
} }
// Handle launch events // Handle launch events
if (s.indexOf(EVENT_KEYWORD_ACTIVITY) >= 0 && args.length == 2) { if (s.indexOf(EVENT_KEYWORD_ACTIVITY) >= 0 && args.length >= 2) {
String pkg_name = args[0]; String pkg_name = args[0];
String cl_name = args[1]; String cl_name = args[1];
String alarmTime = null;
ComponentName mApp = new ComponentName(pkg_name, cl_name); ComponentName mApp = new ComponentName(pkg_name, cl_name);
MonkeyActivityEvent e = new MonkeyActivityEvent(mApp);
mQ.addLast(e); if (args.length > 2) {
alarmTime = args[2];
}
if (args.length == 2) {
MonkeyActivityEvent e = new MonkeyActivityEvent(mApp);
mQ.addLast(e);
} else {
MonkeyActivityEvent e = new MonkeyActivityEvent(mApp, alarmTime);
mQ.addLast(e);
}
return; return;
} }