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

Commit b979dcab authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Merge "Zygote: Set libbase default tag on fork" am: cb114c54 am:...

Merge "Merge "Zygote: Set libbase default tag on fork" am: cb114c54 am: f96d9741" into pi-dev-plus-aosp
am: db0a421c

Change-Id: Ib53d2cd8d6e056340e907b4cbbbada525e25c4fd
parents 0435563b db0a421c
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -488,6 +488,8 @@ void SetThreadName(const char* thread_name) {
  if (errno != 0) {
    ALOGW("Unable to set the name of current thread to '%s': %s", buf, strerror(errno));
  }
  // Update base::logging default tag.
  android::base::SetDefaultTag(buf);
}

// The list of open zygote file descriptors.
@@ -685,10 +687,10 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra

    // Make it easier to debug audit logs by setting the main thread's name to the
    // nice name rather than "app_process".
    if (se_info_c_str == NULL && is_system_server) {
    if (se_name_c_str == NULL && is_system_server) {
      se_name_c_str = "system_server";
    }
    if (se_info_c_str != NULL) {
    if (se_name_c_str != NULL) {
      SetThreadName(se_name_c_str);
    }