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

Commit c81dba07 authored by Prashanth Swaminathan's avatar Prashanth Swaminathan Committed by Gerrit Code Review
Browse files

Merge "Set child process name with child zygote args" into main

parents 9df48db6 4651c3f8

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;

                    }

                }