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

Commit 65607328 authored by Prashanth Swaminathan's avatar Prashanth Swaminathan Committed by Automerger Merge Worker
Browse files

Merge "Set child process name with child zygote args" into main am: c81dba07 

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



Change-Id: Id1c9e302ad90a3649a0069e7dcbcfb2e5c270366
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ee3d0778 c81dba07

core/java/com/android/internal/os/Zygote.java

+5 −0
Original line number Diff line number Diff line
@@ -868,6 +868,11 @@ public final class Zygote { 
                                 args.mPkgDataInfoList, args.mAllowlistedDataInfoList,

                                 args.mBindMountAppDataDirs, args.mBindMountAppStorageDirs);



            // While `specializeAppProcess` sets the thread name on the process's main thread, this

            // is distinct from the app process name which appears in stack traces, as the latter is

            // sourced from the argument buffer of the Process class. Set the app process name here.

            Zygote.setAppProcessName(args, TAG);



            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);



            return ZygoteInit.zygoteInit(args.mTargetSdkVersion,

core/java/com/android/internal/os/ZygoteConnection.java

+0 −1
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ class ZygoteConnection { 
                    } else {

                        // child; result is a Runnable.

                        zygoteServer.setForkChild();

                        Zygote.setAppProcessName(parsedArgs, TAG);  // ??? Necessary?

                        return result;

                    }

                }