| commit | 25128ddbfd9f5e5621af1a822a613a7850b1ae60 | [log] [tgz] |
|---|---|---|
| author | Hans Boehm <hboehm@google.com> | Mon Mar 07 17:25:45 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 07 17:25:45 2022 +0000 |
| tree | 950227a6d487af86e71404fc50c2422e5041c8cb | |
| parent | b8cda9d7e0e35864dfb9a797a81d32ac2683b00d [diff] | |
| parent | ef1cd8a1cad35f576d9bcf3b1c699a7ab89d711d [diff] |
Merge "Increase Zygote command buffer size to 32k." am: ef1cd8a1ca Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2009575 Change-Id: Ic2f9475d8cf8b5d087ddbceedcc73c61982f13ce
diff --git a/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp b/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp index 248db76..0c05da5 100644 --- a/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp +++ b/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp
@@ -45,7 +45,7 @@ // WARNING: Knows a little about the wire protocol used to communicate with Zygote. // TODO: Fix error handling. -constexpr size_t MAX_COMMAND_BYTES = 12200; +constexpr size_t MAX_COMMAND_BYTES = 32768; constexpr size_t NICE_NAME_BYTES = 50; // A buffer optionally bundled with a file descriptor from which we can fill it. @@ -273,8 +273,6 @@ char mBuffer[MAX_COMMAND_BYTES]; }; -static_assert(sizeof(NativeCommandBuffer) < 3 * 4096); - static int buffersAllocd(0); // Get a new NativeCommandBuffer. Can only be called once between freeNativeBuffer calls,