am 04b243d0: Fix NPE during ANRs.

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

* commit '04b243d0f5470cfaf67cce5534f9a9fb2e30855c':
  Fix NPE during ANRs.

1 files changed, 1 insertions, 1 deletions

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index ec209eda3178..4d18191a5ab5 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -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");