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

am c56b26b8: Merge change 6997 into donut

Browse Source 
Merge commit 'c56b26b8b0425fd8f27b381d716408b64f43699e'

* commit 'c56b26b8b0425fd8f27b381d716408b64f43699e':
  Rename IActivityWatcher to IActivityController
This commit is contained in:
Android (Google) Code Review
2009-07-14 12:01:50 -07:00
committed by The Android Open Source Project
parent da73c40ff0 c56b26b8b0
commit 7b627e8935
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmds/monkey/src/com/android/commands/monkey/Monkey.java
View File

@@ -19,7 +19,7 @@ package com.android.commands.monkey;
import android.app.ActivityManagerNative; import android.app.ActivityManagerNative;
import android.app.IActivityManager; import android.app.IActivityManager;
import android.app.IActivityWatcher; import android.app.IActivityController;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.content.pm.IPackageManager; import android.content.pm.IPackageManager;
@@ -88,10 +88,10 @@ public class Monkey {
/** This is set when we would like to abort the running of the monkey. */ /** This is set when we would like to abort the running of the monkey. */
private boolean mAbort; private boolean mAbort;
/** This is set by the ActivityWatcher thread to request collection of ANR trace files */ /** This is set by the ActivityController thread to request collection of ANR trace files */
private boolean mRequestAnrTraces = false; private boolean mRequestAnrTraces = false;
/** This is set by the ActivityWatcher thread to request a "dumpsys meminfo" */ /** This is set by the ActivityController thread to request a "dumpsys meminfo" */
private boolean mRequestDumpsysMemInfo = false; private boolean mRequestDumpsysMemInfo = false;
/** Kill the process after a timeout or crash. */ /** Kill the process after a timeout or crash. */
@@ -135,7 +135,7 @@ public class Monkey {
/** /**
* Monitor operations happening in the system. * Monitor operations happening in the system.
*/ */
private class ActivityWatcher extends IActivityWatcher.Stub { private class ActivityController extends IActivityController.Stub {
public boolean activityStarting(Intent intent, String pkg) { public boolean activityStarting(Intent intent, String pkg) {
boolean allow = checkEnteringPackage(pkg) || (DEBUG_ALLOW_ANY_STARTS != 0); boolean allow = checkEnteringPackage(pkg) || (DEBUG_ALLOW_ANY_STARTS != 0);
if (mVerbose > 0) { if (mVerbose > 0) {
@@ -246,7 +246,7 @@ public class Monkey {
/** /**
* Run "dumpsys meminfo" * Run "dumpsys meminfo"
* *
* NOTE: You cannot perform a dumpsys call from the ActivityWatcher callback, as it will * NOTE: You cannot perform a dumpsys call from the ActivityController callback, as it will
* deadlock. This should only be called from the main loop of the monkey. * deadlock. This should only be called from the main loop of the monkey.
*/ */
private void reportDumpsysMemInfo() { private void reportDumpsysMemInfo() {
@@ -425,7 +425,7 @@ public class Monkey {
} }
try { try {
mAm.setActivityWatcher(null); mAm.setActivityController(null);
mNetworkMonitor.unregister(mAm); mNetworkMonitor.unregister(mAm);
} catch (RemoteException e) { } catch (RemoteException e) {
// just in case this was latent (after mCount cycles), make sure // just in case this was latent (after mCount cycles), make sure
@@ -608,7 +608,7 @@ public class Monkey {
} }
try { try {
mAm.setActivityWatcher(new ActivityWatcher()); mAm.setActivityController(new ActivityController());
mNetworkMonitor.register(mAm); mNetworkMonitor.register(mAm);
} catch (RemoteException e) { } catch (RemoteException e) {
System.err.println("** Failed talking with activity manager!"); System.err.println("** Failed talking with activity manager!");