diff options
| author | 2021-05-14 17:27:46 +0000 | |
|---|---|---|
| committer | 2021-05-14 17:27:46 +0000 | |
| commit | f9d8fff2948c9e5fee894719f8a9443820c10172 (patch) | |
| tree | 20868cbf48bf9cf86915cd51400124b72e2bf37c | |
| parent | a111377f7d2c9b5e26321613682259ad3db9a670 (diff) | |
| parent | cd95e9fa3b3786af55b502ebdaf409e76e25b59b (diff) | |
Merge "Fix error formatting issues" am: cd95e9fa3b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1707886
Change-Id: I4fdf71f667af2ab6f2276d53b210a892e1fca912
| -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 24fef4881e4c..5fe96ede202e 100644 --- a/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp +++ b/core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp @@ -402,7 +402,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; @@ -453,7 +453,7 @@ jboolean com_android_internal_os_ZygoteCommandBuffer_nativeForkRepeatedly( close(session_socket); int new_fd = 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 |