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

Merge "NativeTombstoneManager: track proto change." am: 5e3543c626 am: 9dc77df4b6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657519

Change-Id: Id01822def93f911af8d913ad5772e3dcab88b169
This commit is contained in:
Josh Gao
2021-03-31 10:03:05 +00:00
committed by Automerger Merge Worker
parent 055f044724 9dc77df4b6
commit e370cca30a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/os/NativeTombstoneManager.java
View File

@@ -392,7 +392,7 @@ public final class NativeTombstoneManager {
int pid = 0; int pid = 0;
int uid = 0; int uid = 0;
String processName = ""; String processName = null;
String crashReason = ""; String crashReason = "";
String selinuxLabel = ""; String selinuxLabel = "";
@@ -407,8 +407,10 @@ public final class NativeTombstoneManager {
uid = stream.readInt(Tombstone.UID); uid = stream.readInt(Tombstone.UID);
break; break;
case (int) Tombstone.PROCESS_NAME: case (int) Tombstone.COMMAND_LINE:
processName = stream.readString(Tombstone.PROCESS_NAME); if (processName == null) {
processName = stream.readString(Tombstone.COMMAND_LINE);
}
break; break;
case (int) Tombstone.CAUSES: case (int) Tombstone.CAUSES:
@@ -472,7 +474,7 @@ public final class NativeTombstoneManager {
result.mAppId = appId; result.mAppId = appId;
result.mPid = pid; result.mPid = pid;
result.mUid = uid; result.mUid = uid;
result.mProcessName = processName; result.mProcessName = processName == null ? "" : processName;
result.mTimestampMs = timestampMs; result.mTimestampMs = timestampMs;
result.mCrashReason = crashReason; result.mCrashReason = crashReason;