diff options
| author | 2019-01-15 15:58:49 +0000 | |
|---|---|---|
| committer | 2019-01-15 15:58:49 +0000 | |
| commit | c586cdd9a97e7c77084d3c3481ef6102798b2685 (patch) | |
| tree | a9114dec5167a18d81b14b14a36ca96eefdd170d | |
| parent | 55c2344bc5a70f490bb6875f5d17e69a0ac2537f (diff) | |
| parent | 2509575739015f26f08902b856c0ecd951b9a9a5 (diff) | |
Merge "Add APEX conscrypt.jar to Zygote whitelist"
| -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 d8d919df6c24..c8e4125efb15 100644 --- 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", |