commit 8ddc3e26e6534adc6f0cdc5c8b9e6ddc3fe3dd10
author Olawale Ogunwale <ogunwale@google.com> Wed Apr 08 16:28:52 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 08 16:28:52 2015 +0000
tree c9c3962ee477199c5f5ca150c8608e3d5c273ec9
parent 380415b6431adeb8138bc328a926807b8ae41df9
parent 393f89f26df724a3da7a21b28925a21fe5fb253f

am 393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash info"

* commit '393f89f26df724a3da7a21b28925a21fe5fb253f':
  [ActivityManager] Avoid NullPointerException if no crash info

core/java/android/app/ApplicationErrorReport.java

diff --git a/core/java/android/app/ApplicationErrorReport.java b/core/java/android/app/ApplicationErrorReport.java
index 6c2511e..8692336 100644
--- a/core/java/android/app/ApplicationErrorReport.java
+++ b/core/java/android/app/ApplicationErrorReport.java
@@ -235,10 +235,13 @@
         dest.writeString(processName);
         dest.writeLong(time);
         dest.writeInt(systemApp ? 1 : 0);
+        dest.writeInt(crashInfo != null ? 1 : 0);
 
         switch (type) {
             case TYPE_CRASH:
-                crashInfo.writeToParcel(dest, flags);
+                if (crashInfo != null) {
+                    crashInfo.writeToParcel(dest, flags);
+                }
                 break;
             case TYPE_ANR:
                 anrInfo.writeToParcel(dest, flags);
@@ -259,10 +262,11 @@
         processName = in.readString();
         time = in.readLong();
         systemApp = in.readInt() == 1;
+        boolean hasCrashInfo = in.readInt() == 1;
 
         switch (type) {
             case TYPE_CRASH:
-                crashInfo = new CrashInfo(in);
+                crashInfo = hasCrashInfo ? new CrashInfo(in) : null;
                 anrInfo = null;
                 batteryInfo = null;
                 runningServiceInfo = null;