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

Merge "[ActivityManager] Avoid NullPointerException if no crash info"

Browse Source
This commit is contained in:
Olawale Ogunwale
2015-04-08 16:07:44 +00:00
committed by Gerrit Code Review
parent 1bdbce295c 3d86b88fa7
commit 393f89f26d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ApplicationErrorReport.java
View File

@@ -235,10 +235,13 @@ public class ApplicationErrorReport implements Parcelable {
dest.writeString(processName); dest.writeString(processName);
dest.writeLong(time); dest.writeLong(time);
dest.writeInt(systemApp ? 1 : 0); dest.writeInt(systemApp ? 1 : 0);
dest.writeInt(crashInfo != null ? 1 : 0);
switch (type) { switch (type) {
case TYPE_CRASH: case TYPE_CRASH:
crashInfo.writeToParcel(dest, flags); if (crashInfo != null) {
crashInfo.writeToParcel(dest, flags);
}
break; break;
case TYPE_ANR: case TYPE_ANR:
anrInfo.writeToParcel(dest, flags); anrInfo.writeToParcel(dest, flags);
@@ -259,10 +262,11 @@ public class ApplicationErrorReport implements Parcelable {
processName = in.readString(); processName = in.readString();
time = in.readLong(); time = in.readLong();
systemApp = in.readInt() == 1; systemApp = in.readInt() == 1;
boolean hasCrashInfo = in.readInt() == 1;
switch (type) { switch (type) {
case TYPE_CRASH: case TYPE_CRASH:
crashInfo = new CrashInfo(in); crashInfo = hasCrashInfo ? new CrashInfo(in) : null;
anrInfo = null; anrInfo = null;
batteryInfo = null; batteryInfo = null;
runningServiceInfo = null; runningServiceInfo = null;