Merge "add dri device to zygote whitelisted FDs" into nyc-mr1-dev

2016-08-30 22:50:03 +00:00
parent 82babe050a 8977e424ee
commit e849dfcc24
1 changed files with 2 additions and 1 deletions
--- 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";