diff options
author | Hans Boehm <hboehm@google.com> | 2021-05-13 17:11:34 -0700 |
---|---|---|
committer | alk3pInjection <webmaster@raspii.tech> | 2021-09-27 21:17:05 +0800 |
commit | 21be9e874f89782eb112d496212d4165e31e50e0 (patch) | |
tree | 6b0d4f229b4b495be8f247347b080672a784526e | |
parent | 0d55d16bc0b6b07f5aa46e089300159a6185a915 (diff) |
[master] Fix error formatting issues
I missed a couple of CREATE_ERROR calls the first time around.
Unfortunately, type checking is loose enough to miss that.
Bug: 187992348
Test: TreeHugger
Change-Id: Ib7c227fa0e8491d8ce7cd0d82217098664e3182d
-rw-r--r-- | core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp b/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp index 4ea2fef97f2f..caba7705ab33 100644 --- a/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp +++ b/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp @@ -403,7 +403,7 @@ jboolean com_android_internal_os_ZygoteCommandBuffer_nativeForkRepeatedly( socklen_t cred_size = sizeof credentials; if (getsockopt(n_buffer->getFd(), SOL_SOCKET, SO_PEERCRED, &credentials, &cred_size) == -1 || cred_size != sizeof credentials) { - fail_fn_1("ForkMany failed to get initial credentials, %s", strerror(errno)); + fail_fn_1(CREATE_ERROR("ForkMany failed to get initial credentials, %s", strerror(errno))); } bool first_time = true; @@ -454,7 +454,7 @@ jboolean com_android_internal_os_ZygoteCommandBuffer_nativeForkRepeatedly( close(session_socket); int new_fd = TEMP_FAILURE_RETRY(accept(zygote_socket_fd, nullptr, nullptr)); if (new_fd == -1) { - fail_fn_z("Accept(%d) failed: %s", zygote_socket_fd, strerror(errno)); + fail_fn_z(CREATE_ERROR("Accept(%d) failed: %s", zygote_socket_fd, strerror(errno))); } if (new_fd != session_socket) { // Move new_fd back to the old value, so that we don't have to change Java-level data |