summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Garfield Tan <xutan@google.com> 2018-07-27 11:29:22 -0700
committer Garfield Tan <xutan@google.com> 2018-07-27 12:12:57 -0700
commit43bf6f3f170436f236cad8145822ce4ed397c828 (patch)
tree1a82a3bf471e1d4497de888d6f7f23a01f0c5428
parent352a72ca0961c2746fd683e0daebb38ab3f2f19e (diff)
Fix a mistake in adding crash tag for resizing.
Bug: 111840655 Test: go/wm-smoke. Change-Id: Ib93d55df184fd8572883592e9089301368ae5c98
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 0cf101cdcea3..42d27ef0b745 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -10406,6 +10406,15 @@ public class ActivityManagerService extends IActivityManager.Stub
: StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__UNKNOWN
);
+ final int relaunchReason = r == null ? ActivityRecord.RELAUNCH_REASON_NONE
+ : r.getWindowProcessController().computeRelaunchReason();
+ final String relaunchReasonString = ActivityRecord.relaunchReasonToString(relaunchReason);
+ if (crashInfo.crashTag == null) {
+ crashInfo.crashTag = relaunchReasonString;
+ } else {
+ crashInfo.crashTag = crashInfo.crashTag + " " + relaunchReasonString;
+ }
+
addErrorToDropBox(eventType, r, processName, null, null, null, null, null, crashInfo);
mAppErrors.crashApplication(r, crashInfo);
@@ -10578,15 +10587,6 @@ public class ActivityManagerService extends IActivityManager.Stub
StatsLog.write(StatsLog.WTF_OCCURRED, callingUid, tag, processName,
callingPid);
- final int relaunchReason = r == null ? ActivityRecord.RELAUNCH_REASON_NONE
- : r.getWindowProcessController().computeRelaunchReason();
- final String relaunchReasonString = ActivityRecord.relaunchReasonToString(relaunchReason);
- if (crashInfo.crashTag == null) {
- crashInfo.crashTag = relaunchReasonString;
- } else {
- crashInfo.crashTag = crashInfo.crashTag + " " + relaunchReasonString;
- }
-
addErrorToDropBox("wtf", r, processName, null, null, tag, null, null, crashInfo);
return r;