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

Commit 8977bfd6 authored by Howard Ro's avatar Howard Ro Committed by Android (Google) Code Review
Browse files

Merge "Close statsd log socket before zygote fork()."

parents bb673622 27330416

core/jni/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -234,6 +234,7 @@ cc_library_shared { 
        "libseccomp_policy",

        "libseccomp_policy",

        "libgrallocusage",

        "libgrallocusage",

        "libscrypt_static",

        "libscrypt_static",

        "libstatssocket",

    ],

    ],





    shared_libs: [

    shared_libs: [

core/jni/com_android_internal_os_Zygote.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <utils/String8.h>

#include <utils/String8.h>

#include <selinux/android.h>

#include <selinux/android.h>

#include <seccomp_policy.h>

#include <seccomp_policy.h>

#include <stats_event_list.h>

#include <processgroup/processgroup.h>

#include <processgroup/processgroup.h>





#include "core_jni_helpers.h"

#include "core_jni_helpers.h"
@@ -932,6 +933,7 @@ static pid_t ForkCommon(JNIEnv* env, jstring java_se_name, bool is_system_server 
  // Close any logging related FDs before we start evaluating the list of

  // Close any logging related FDs before we start evaluating the list of

  // file descriptors.

  // file descriptors.

  __android_log_close();

  __android_log_close();

  stats_log_close();





  std::string error_msg;

  std::string error_msg;