summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-02-01 07:00:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-02-01 07:00:29 +0000
commit679c324ba79e36c18b29385b5a0ec334fc10de90 (patch)
tree5c21ee511c5dc53daaca6eb75447d132282bd441
parent530d5efed9100d4f1f3d0cec5f361b76d89b5378 (diff)
parente77dc7a00bbfe8dd26ca86f7d331e7d30c9b4c0f (diff)
Merge "Add /sys/kernel/tracing/trace_marker to whitelist" am: e77dc7a00b
Change-Id: I8b5755d66f06de805f23678548c5ecb6f55eb7a9
-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 1b6d622e917e..ca4735ec665a 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -46,6 +46,7 @@ static const char* kPathWhitelist[] = {
"/dev/socket/webview_zygote",
"/dev/socket/heapprofd",
"/sys/kernel/debug/tracing/trace_marker",
+ "/sys/kernel/tracing/trace_marker",
"/system/framework/framework-res.apk",
"/dev/urandom",
"/dev/ion",