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

Commit 8e36fb00 authored by Christian Wailes's avatar Christian Wailes Committed by android-build-merger
Browse files

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

am: cdcf3404

Change-Id: I7e56dadb11ad2a0c4bd0ba55d918c3308ae8dc8a
parents 4db354e0 cdcf3404

core/jni/Android.bp

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

        "libgrallocusage",

        "libscrypt_static",

        "libstatssocket",

    ],



    shared_libs: [

core/jni/com_android_internal_os_Zygote.cpp

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

#include <selinux/android.h>

#include <seccomp_policy.h>

#include <stats_event_list.h>

#include <processgroup/processgroup.h>



#include "core_jni_helpers.h"
@@ -788,6 +789,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

  // file descriptors.

  __android_log_close();

  stats_log_close();



  std::string error_msg;