commit 65ff03a1fc56cd272529d1423ddef8e383cad7c0
author Brad Fitzpatrick <bradfitz@android.com> Mon Jun 21 09:05:16 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 21 09:05:16 2010 -0700
tree b942e90bc118882a51e224e272a8233f247365ea
parent fddf19f671dc91b9c50fa82870e1b3df29ce397a
parent 04b243d0f5470cfaf67cce5534f9a9fb2e30855c

am 04b243d0: Fix NPE during ANRs.

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

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

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

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