Fix NPE during ANRs.

BUG=2780838 Change-Id: I0d5e9a2323130ca14d1f0df684c8abe4f4dad05a
2010-06-21 08:01:13 -07:00
parent a2650db770
commit 04b243d0f5
1 changed files with 1 additions and 1 deletions
--- 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");