Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 04b243d0: Fix NPE during ANRs.

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

* commit '04b243d0f5470cfaf67cce5534f9a9fb2e30855c':
  Fix NPE during ANRs.
This commit is contained in:
Brad Fitzpatrick
2010-06-21 09:05:16 -07:00
committed by Android Git Automerger
parent fddf19f671 04b243d0f5
commit 65ff03a1fc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityManagerService.java
View File

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