summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Florian Mayer <fmayer@google.com> 2018-10-31 15:16:32 -0700
committer android-build-merger <android-build-merger@google.com> 2018-10-31 15:16:32 -0700
commitf644eaaaa69c4e9dd5e2db70569100ee765fd8a1 (patch)
treee0a111c085d44731108ce086af62cd485914baad
parent28c17c9d70bbfeae86d2b7cdca3f3c09e30dac86 (diff)
parentce9b090733148de88971f0f32c87aa86e40d555d (diff)
Merge "Allow zygote to keep socket to heapprofd." am: 4db6cb15de
am: ce9b090733 Change-Id: Idfb6717b63db717cbd449172a45672bd501146f5
-rw-r--r--core/jni/fd_utils.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index c5904e0e9e5e..d457a1b48e38 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -37,6 +37,7 @@ static const char* kPathWhitelist[] = {
"/dev/socket/zygote",
"/dev/socket/zygote_secondary",
"/dev/socket/webview_zygote",
+ "/dev/socket/heapprofd",
"/sys/kernel/debug/tracing/trace_marker",
"/system/framework/framework-res.apk",
"/dev/urandom",