Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52459529 authored by Christian Wailes's avatar Christian Wailes Committed by Automerger Merge Worker
Browse files

Merge "Fix error formatting issues" am: cd95e9fa am: f9d8fff2 am: 207d64db 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1707886

Change-Id: I648f68c5ab773b74d6ec716b220858b19c914b92
parents 966a00ca 207d64db

core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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