summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Rowe <erowe@google.com> 2013-04-08 15:00:27 -0700
committer Eric Rowe <erowe@google.com> 2013-04-08 15:00:27 -0700
commit88d842cf8a3adcae5cd2d243dcc182c96f40db29 (patch)
tree71ba7dfdb1940ca05befb055f26214137f25765f
parent50b9eb1c7375a87525d44a036337a8ba18eba55b (diff)
Change dropbox tag for native crashes.
Change-Id: Id2738fc758c3d144e5fdd2c7f1c8617dad129338
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java6
-rw-r--r--services/java/com/android/server/am/NativeCrashListener.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 7710f136702d..26a20b9312bb 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -8350,13 +8350,13 @@ public final class ActivityManagerService extends ActivityManagerNative
final String processName = app == null ? "system_server"
: (r == null ? "unknown" : r.processName);
- handleApplicationCrashInner(r, processName, crashInfo);
+ handleApplicationCrashInner("crash", r, processName, crashInfo);
}
/* Native crash reporting uses this inner version because it needs to be somewhat
* decoupled from the AM-managed cleanup lifecycle
*/
- void handleApplicationCrashInner(ProcessRecord r, String processName,
+ void handleApplicationCrashInner(String eventType, ProcessRecord r, String processName,
ApplicationErrorReport.CrashInfo crashInfo) {
EventLog.writeEvent(EventLogTags.AM_CRASH, Binder.getCallingPid(),
UserHandle.getUserId(Binder.getCallingUid()), processName,
@@ -8366,7 +8366,7 @@ public final class ActivityManagerService extends ActivityManagerNative
crashInfo.throwFileName,
crashInfo.throwLineNumber);
- addErrorToDropBox("crash", r, processName, null, null, null, null, null, crashInfo);
+ addErrorToDropBox(eventType, r, processName, null, null, null, null, null, crashInfo);
crashApplication(r, crashInfo);
}
diff --git a/services/java/com/android/server/am/NativeCrashListener.java b/services/java/com/android/server/am/NativeCrashListener.java
index e83433fd65e9..0688c50e863c 100644
--- a/services/java/com/android/server/am/NativeCrashListener.java
+++ b/services/java/com/android/server/am/NativeCrashListener.java
@@ -82,7 +82,7 @@ class NativeCrashListener extends Thread {
ci.stackTrace = mCrashReport;
if (DEBUG) Slog.v(TAG, "Calling handleApplicationCrash()");
- mAm.handleApplicationCrashInner(mApp, mApp.processName, ci);
+ mAm.handleApplicationCrashInner("native_crash", mApp, mApp.processName, ci);
if (DEBUG) Slog.v(TAG, "<-- handleApplicationCrash() returned");
} catch (Exception e) {
Slog.e(TAG, "Unable to report native crash", e);