Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 14bfa398: Infrastructure to report running services to developer.

Browse Source 
Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp

* commit '14bfa398a4e8697ce5822861a684b7d1245e4a85':
  Infrastructure to report running services to developer.
This commit is contained in:
Dianne Hackborn
2010-07-26 12:24:57 -07:00
committed by Android Git Automerger
parent ef1b9c6aa7 14bfa398a4
commit b6022e3d50
2 changed files with 93 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
core/java/android/app/ApplicationErrorReport.java
View File

@@ -78,6 +78,11 @@ public class ApplicationErrorReport implements Parcelable {
*/
public static final int TYPE_STRICT_MODE_VIOLATION = 4;
/**
* An error report about a StrictMode violation.
*/
public static final int TYPE_RUNNING_SERVICE = 5;
/**
* Type of this report. Can be one of {@link #TYPE_NONE},
* {@link #TYPE_CRASH}, {@link #TYPE_ANR}, or {@link #TYPE_BATTERY}.
@@ -129,6 +134,12 @@ public class ApplicationErrorReport implements Parcelable {
*/
public BatteryInfo batteryInfo;
/**
* If this report is of type {@link #TYPE_RUNNING_SERVICE}, contains an instance
* of RunningServiceInfo; otherwise null.
*/
public RunningServiceInfo runningServiceInfo;
/**
* Create an uninitialized instance of {@link ApplicationErrorReport}.
*/
@@ -223,6 +234,9 @@ public class ApplicationErrorReport implements Parcelable {
case TYPE_BATTERY:
batteryInfo.writeToParcel(dest, flags);
break;
case TYPE_RUNNING_SERVICE:
runningServiceInfo.writeToParcel(dest, flags);
break;
}
}
@@ -239,16 +253,25 @@ public class ApplicationErrorReport implements Parcelable {
crashInfo = new CrashInfo(in);
anrInfo = null;
batteryInfo = null;
runningServiceInfo = null;
break;
case TYPE_ANR:
anrInfo = new AnrInfo(in);
crashInfo = null;
batteryInfo = null;
runningServiceInfo = null;
break;
case TYPE_BATTERY:
batteryInfo = new BatteryInfo(in);
anrInfo = null;
crashInfo = null;
runningServiceInfo = null;
break;
case TYPE_RUNNING_SERVICE:
batteryInfo = null;
anrInfo = null;
crashInfo = null;
runningServiceInfo = new RunningServiceInfo(in);
break;
}
}
@@ -494,6 +517,51 @@ public class ApplicationErrorReport implements Parcelable {
}
}
/**
* Describes a running service report.
*/
public static class RunningServiceInfo {
/**
* Duration in milliseconds that the service has been running.
*/
public long durationMillis;
/**
* Dump of debug information about the service.
*/
public String serviceDetails;
/**
* Create an uninitialized instance of RunningServiceInfo.
*/
public RunningServiceInfo() {
}
/**
* Create an instance of RunningServiceInfo initialized from a Parcel.
*/
public RunningServiceInfo(Parcel in) {
durationMillis = in.readLong();
serviceDetails = in.readString();
}
/**
* Save a RunningServiceInfo instance to a parcel.
*/
public void writeToParcel(Parcel dest, int flags) {
dest.writeLong(durationMillis);
dest.writeString(serviceDetails);
}
/**
* Dump a BatteryInfo instance to a Printer.
*/
public void dump(Printer pw, String prefix) {
pw.println(prefix + "durationMillis: " + durationMillis);
pw.println(prefix + "serviceDetails: " + serviceDetails);
}
}
public static final Parcelable.Creator<ApplicationErrorReport> CREATOR
= new Parcelable.Creator<ApplicationErrorReport>() {
public ApplicationErrorReport createFromParcel(Parcel source) {

33
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -6755,7 +6755,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
}
return;
} else if ("service".equals(cmd)) {
dumpService(fd, pw, args, opti, true);
dumpService(fd, pw, args, opti, dumpAll);
return;
} else if ("services".equals(cmd) || "s".equals(cmd)) {
synchronized (this) {
@@ -7061,20 +7061,28 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
componentNameString = args[opti];
opti++;
ComponentName componentName = ComponentName.unflattenFromString(componentNameString);
r = componentName != null ? mServices.get(componentName) : null;
synchronized (this) {
r = componentName != null ? mServices.get(componentName) : null;
}
newArgs = new String[args.length - opti];
if (args.length > 2) System.arraycopy(args, opti, newArgs, 0, args.length - opti);
}
if (r != null) {
dumpService(fd, pw, r, newArgs);
dumpService(fd, pw, r, newArgs, dumpAll);
} else {
for (ServiceRecord r1 : mServices.values()) {
if (componentNameString == null
|| r1.name.flattenToString().contains(componentNameString)) {
dumpService(fd, pw, r1, newArgs);
ArrayList<ServiceRecord> services = new ArrayList<ServiceRecord>();
synchronized (this) {
for (ServiceRecord r1 : mServices.values()) {
if (componentNameString == null
|| r1.name.flattenToString().contains(componentNameString)) {
services.add(r1);
}
}
}
for (int i=0; i<services.size(); i++) {
dumpService(fd, pw, services.get(i), newArgs, dumpAll);
}
}
}
@@ -7082,8 +7090,16 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
* Invokes IApplicationThread.dumpService() on the thread of the specified service if
* there is a thread associated with the service.
*/
private void dumpService(FileDescriptor fd, PrintWriter pw, ServiceRecord r, String[] args) {
private void dumpService(FileDescriptor fd, PrintWriter pw, ServiceRecord r, String[] args,
boolean dumpAll) {
pw.println(" Service " + r.name.flattenToString());
if (dumpAll) {
synchronized (this) {
pw.print(" * "); pw.println(r);
r.dump(pw, " ");
}
pw.println("");
}
if (r.app != null && r.app.thread != null) {
try {
// flush anything that is already in the PrintWriter since the thread is going
@@ -7091,6 +7107,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
pw.flush();
r.app.thread.dumpService(fd, r, args);
pw.print("\n");
pw.flush();
} catch (RemoteException e) {
pw.println("got a RemoteException while dumping the service");
}