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

Commit cf4d0c45 authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

Merge "NativeTombstoneManager: track proto change." am: 5e3543c6 am:... 

Merge "NativeTombstoneManager: track proto change." am: 5e3543c6 am: 9dc77df4 am: e370cca3 am: 5e4659c7

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

Change-Id: Iac05cebbcde60a517aad37e269453eefc144d86b
parents f7f5c03e 5e4659c7

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

+6 −4
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ public final class NativeTombstoneManager { 


            int pid = 0;

            int uid = 0;

            String processName = "";

            String processName = null;

            String crashReason = "";

            String selinuxLabel = "";
@@ -407,8 +407,10 @@ public final class NativeTombstoneManager { 
                            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 @@ public final class NativeTombstoneManager { 
            result.mAppId = appId;

            result.mPid = pid;

            result.mUid = uid;

            result.mProcessName = processName;

            result.mProcessName = processName == null ? "" : processName;

            result.mTimestampMs = timestampMs;

            result.mCrashReason = crashReason;