Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ddc3e26 authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

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

* commit '393f89f2':
  [ActivityManager] Avoid NullPointerException if no crash info
parents 380415b6 393f89f2

core/java/android/app/ApplicationErrorReport.java

+6 −2
Original line number Diff line number Diff line
@@ -235,10 +235,13 @@ public class ApplicationErrorReport implements Parcelable { 
        dest.writeString(processName);

        dest.writeLong(time);

        dest.writeInt(systemApp ? 1 : 0);

        dest.writeInt(crashInfo != null ? 1 : 0);



        switch (type) {

            case TYPE_CRASH:

                if (crashInfo != null) {

                    crashInfo.writeToParcel(dest, flags);

                }

                break;

            case TYPE_ANR:

                anrInfo.writeToParcel(dest, flags);
@@ -259,10 +262,11 @@ public class ApplicationErrorReport implements Parcelable { 
        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;