Merge "Add APEX conscrypt.jar to Zygote whitelist" am: c586cdd9a9

am: ee87b785a9 Change-Id: I7bdee7b13ba8fbdb45f07fd12a75b4bffb469102
2019-01-15 08:22:17 -08:00
parent 0296c0cf26 ee87b785a9
commit 244cc0c9c7
1 changed files with 1 additions and 0 deletions
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -33,6 +33,7 @@

 // Static whitelist of open paths that the zygote is allowed to keep open.
 static const char* kPathWhitelist[] = {
+  "/apex/com.android.conscrypt/javalib/conscrypt.jar",
  "/dev/null",
  "/dev/socket/zygote",
  "/dev/socket/zygote_secondary",