diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-06-21 08:01:13 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2010-06-21 08:01:13 -0700 |
| commit | 04b243d0f5470cfaf67cce5534f9a9fb2e30855c (patch) | |
| tree | caf2945f0ce02c78066b9e46df5cd7619b628776 /services/java/com/android | |
| parent | a2650db770e93a9424d6d6948fd31f943f6dac49 (diff) | |
| download | frameworks_base-04b243d0f5470cfaf67cce5534f9a9fb2e30855c.zip frameworks_base-04b243d0f5470cfaf67cce5534f9a9fb2e30855c.tar.gz frameworks_base-04b243d0f5470cfaf67cce5534f9a9fb2e30855c.tar.bz2 | |
Fix NPE during ANRs.
BUG=2780838
Change-Id: I0d5e9a2323130ca14d1f0df684c8abe4f4dad05a
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
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 ec209ed..4d18191 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"); |