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

Commit 65ff03a1 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

am 04b243d0: Fix NPE during ANRs. 

Merge commit '04b243d0' into gingerbread-plus-aosp

* commit '04b243d0':
  Fix NPE during ANRs.
parents fddf19f6 04b243d0

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

+1 −1
Original line number Diff line number Diff line
@@ -9538,7 +9538,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 
            sb.append("Subject: ").append(subject).append("\n");

        }

        sb.append("Build: ").append(Build.FINGERPRINT).append("\n");

        if (crashInfo.durationMillis != -1) {

        if (crashInfo != null && crashInfo.durationMillis != -1) {

            sb.append("Duration-Millis: ").append(crashInfo.durationMillis).append("\n");

        }

        sb.append("\n");