diff options
| author | 2016-08-30 22:50:03 +0000 | |
|---|---|---|
| committer | 2016-08-30 22:50:05 +0000 | |
| commit | e849dfcc24f02d1624bf5e4ece6f96bd9887d5d8 (patch) | |
| tree | fb62c65071421ce43de0415ad7f33255f0bcaf3e | |
| parent | 82babe050a08101ee716ad22608bd21a6c112eff (diff) | |
| parent | 8977e424ee2d6d85fec419532ae510131aa88c45 (diff) | |
Merge "add dri device to zygote whitelisted FDs" into nyc-mr1-dev
| -rw-r--r-- | core/jni/fd_utils-inl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/fd_utils-inl.h b/core/jni/fd_utils-inl.h index 1f34b0275384..c6a3e97a6916 100644 --- a/core/jni/fd_utils-inl.h +++ b/core/jni/fd_utils-inl.h @@ -45,7 +45,8 @@ static const char* kPathWhitelist[] = { "/sys/kernel/debug/tracing/trace_marker", "/system/framework/framework-res.apk", "/dev/urandom", - "/dev/ion" + "/dev/ion", + "/dev/dri/renderD129", // Fixes b/31172436 }; static const char* kFdPath = "/proc/self/fd"; |