commit e370cca30a73fb528a8d2778463fabf0b44f7098
author Josh Gao <jmgao@google.com> Wed Mar 31 10:03:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 31 10:03:05 2021 +0000
tree 2e37794731d5e89e82063d291c7bb91598f75920
parent 055f044724eb163615f18a8194b240c757e135de
parent 9dc77df4b6d407d1d2855a078e1af45dea5eddf0

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

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

Change-Id: Id01822def93f911af8d913ad5772e3dcab88b169

services/core/java/com/android/server/os/NativeTombstoneManager.java

diff --git a/services/core/java/com/android/server/os/NativeTombstoneManager.java b/services/core/java/com/android/server/os/NativeTombstoneManager.java
index cc6a824..ed1f5f5 100644
--- a/services/core/java/com/android/server/os/NativeTombstoneManager.java
+++ b/services/core/java/com/android/server/os/NativeTombstoneManager.java
@@ -392,7 +392,7 @@
 
             int pid = 0;
             int uid = 0;
-            String processName = "";
+            String processName = null;
             String crashReason = "";
             String selinuxLabel = "";
 
@@ -407,8 +407,10 @@
                             uid = stream.readInt(Tombstone.UID);
                             break;
 
-                        case (int) Tombstone.PROCESS_NAME:
-                            processName = stream.readString(Tombstone.PROCESS_NAME);
+                        case (int) Tombstone.COMMAND_LINE:
+                            if (processName == null) {
+                                processName = stream.readString(Tombstone.COMMAND_LINE);
+                            }
                             break;
 
                         case (int) Tombstone.CAUSES:
@@ -472,7 +474,7 @@
             result.mAppId = appId;
             result.mPid = pid;
             result.mUid = uid;
-            result.mProcessName = processName;
+            result.mProcessName = processName == null ? "" : processName;
             result.mTimestampMs = timestampMs;
             result.mCrashReason = crashReason;