summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-03-16 08:29:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-03-16 08:29:49 +0000
commit499a39a342ec342b04364ebaf89848dac39a1213 (patch)
treea8e84f5de45404ed8d0382b0b849782a096c31a5
parentccdb324274f411d3a56cee7f13603a31b08636c1 (diff)
parente909c26744d827d254e98f30356eb16f7c33d0e6 (diff)
downloadbase-499a39a342ec342b04364ebaf89848dac39a1213.tar.gz
Merge "Increase Zygote command buffer size to 32k." into android12-dev
-rw-r--r--core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp b/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp
index 248db76da71d..0c05da551c8f 100644
--- a/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp
+++ b/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp
@@ -45,7 +45,7 @@ using android::zygote::ZygoteFailure;
// 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 @@ class NativeCommandBuffer {
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,