summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJacek Surazski <jaceks@google.com>2010-08-03 11:08:21 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-03 11:08:21 -0700
commitee9907b4619ea9f3551ee7f5a2c5a803e3ee636c (patch)
treefd8a7e020e6319c335bdedf6821b7780a22b3257 /core/java
parentd1ce7496f116e1622b8de8c4f912c657eb53eac6 (diff)
parent87d0b2f42209ab1dd4eed71e3b74b31bbcccf663 (diff)
downloadframeworks_base-ee9907b4619ea9f3551ee7f5a2c5a803e3ee636c.zip
frameworks_base-ee9907b4619ea9f3551ee7f5a2c5a803e3ee636c.tar.gz
frameworks_base-ee9907b4619ea9f3551ee7f5a2c5a803e3ee636c.tar.bz2
Merge "Add dumping of Running Service reports to ApplicationErrorReports"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/ApplicationErrorReport.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/app/ApplicationErrorReport.java b/core/java/android/app/ApplicationErrorReport.java
index 2382596..1e012eb 100644
--- a/core/java/android/app/ApplicationErrorReport.java
+++ b/core/java/android/app/ApplicationErrorReport.java
@@ -184,7 +184,7 @@ public class ApplicationErrorReport implements Parcelable {
candidate = SystemProperties.get(DEFAULT_ERROR_RECEIVER_PROPERTY);
return getErrorReportReceiver(pm, packageName, candidate);
}
-
+
/**
* Return activity in receiverPackage that handles ACTION_APP_ERROR.
*
@@ -581,6 +581,9 @@ public class ApplicationErrorReport implements Parcelable {
case TYPE_BATTERY:
batteryInfo.dump(pw, prefix);
break;
+ case TYPE_RUNNING_SERVICE:
+ runningServiceInfo.dump(pw, prefix);
+ break;
}
}
}