Merge "Add APEX conscrypt.jar to Zygote whitelist"

am: c586cdd9a9 Change-Id: I15eefa7aa087e19973f20c420a128537ed1c36ca
2019-01-15 08:12:50 -08:00
parent 4524abd318 c586cdd9a9
commit ee87b785a9
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",