diff options
| author | 2019-01-15 16:33:26 +0000 | |
|---|---|---|
| committer | 2019-01-15 16:33:26 +0000 | |
| commit | e12dacbd690b206721cd9b47d9ec8ab1e8879b4c (patch) | |
| tree | 4e8c0a012aa87cae8ecf30de81a90c657ea5b2be | |
| parent | 0736f6ec51717dcfb50786a20f4942ca78d73414 (diff) | |
| parent | ca8cfacc4c6d8090c4fee5a3ff74421b27c495a8 (diff) | |
Merge "Merge "Add APEX conscrypt.jar to Zygote whitelist" am: c586cdd9a9 am: ee87b785a9 am: 244cc0c9c7"
| -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 bd87dcc325a8..41e00b9461c8 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", |