Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43bf6f3f authored by Garfield Tan's avatar Garfield Tan
Browse files

Fix a mistake in adding crash tag for resizing. 

Bug: 111840655
Test: go/wm-smoke.
Change-Id: Ib93d55df184fd8572883592e9089301368ae5c98
parent 352a72ca

services/core/java/com/android/server/am/ActivityManagerService.java

+9 −9
Original line number Original line Diff line number Diff line
@@ -10406,6 +10406,15 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        : StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__UNKNOWN

                        : 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);







        addErrorToDropBox(eventType, r, processName, null, null, null, null, null, crashInfo);



























        mAppErrors.crashApplication(r, crashInfo);







        mAppErrors.crashApplication(r, crashInfo);










@@ -10578,15 +10587,6 @@ public class ActivityManagerService extends IActivityManager.Stub









        StatsLog.write(StatsLog.WTF_OCCURRED, callingUid, tag, processName,







        StatsLog.write(StatsLog.WTF_OCCURRED, callingUid, tag, processName,











                callingPid);







                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);







        addErrorToDropBox("wtf", r, processName, null, null, tag, null, null, crashInfo);



























        return r;







        return r;