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

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

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



Change-Id: I4719450508e128e0a10efe06e340909d46e5aa65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -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

@@ -296,7 +296,6 @@ class ZygoteConnection {
                     } else {
                         // child; result is a Runnable.
                         zygoteServer.setForkChild();
-                        Zygote.setAppProcessName(parsedArgs, TAG);  // ??? Necessary?
                         return result;
                     }
                 }