Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b3d2890291

Change-Id: I36980ccf0fde260f49be3a4f0bd9e134d5f1e724
This commit is contained in:
Christian Wailes
2018-11-02 14:26:22 -07:00
committed by android-build-merger
parent e2c37b94d7 b3d2890291
commit cdcf340421
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/Android.bp
View File

@@ -229,6 +229,7 @@ cc_library_shared {
"libseccomp_policy", "libseccomp_policy",
"libgrallocusage", "libgrallocusage",
"libscrypt_static", "libscrypt_static",
"libstatssocket",
], ],
shared_libs: [ shared_libs: [

2
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -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"
@@ -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 // 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;