drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '8ddc3e26e6534adc6f0cdc5c8b9e6ddc3fe3dd10':
  [ActivityManager] Avoid NullPointerException if no crash info
This commit is contained in:
Olawale Ogunwale
2015-04-08 16:40:24 +00:00
committed by Android Git Automerger
parent ce5bdfea12 8ddc3e26e6
commit 81954cf308
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.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 @@ 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;