diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 07:11:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 07:11:01 +0000 |
| commit | e444680c965cbfb7fba8de594a8e184b6974b3dc (patch) | |
| tree | 2ada331619935ace08f129e79e4afe4038b9cdeb /core/jni/fd_utils.cpp | |
| parent | 06f95ff0b7c6633eda9ca994f28dc614fa1b8f6a (diff) | |
| parent | 679c324ba79e36c18b29385b5a0ec334fc10de90 (diff) | |
Merge "Add /sys/kernel/tracing/trace_marker to whitelist" am: e77dc7a00b am: 679c324ba7
Change-Id: I0a288a291e9a986b0029755c29568a370aa877fc
Diffstat (limited to 'core/jni/fd_utils.cpp')
| -rw-r--r-- | core/jni/fd_utils.cpp | 1 |
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", |