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

Commit ee1fd45a authored by Chris Wailes's avatar Chris Wailes
Browse files

Replaces custom code with a library function. 

This CL replaces custom code for fetching socket FDs from environment
variables with calls to a cutils library function.

Test: m & boot
Change-Id: I5dfb67776ac6fc5a539ad91ce47b1546c05bd9ea
parent ff8d4e7a

core/jni/com_android_internal_os_Zygote.cpp

+7 −18
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#include <cutils/ashmem.h>

#include <cutils/fs.h>

#include <cutils/multiuser.h>

#include <cutils/sockets.h>

#include <private/android_filesystem_config.h>

#include <utils/String8.h>

#include <utils/Trace.h>
@@ -135,13 +136,6 @@ static bool gIsSecurityEnforced = true; 
 */

static constexpr size_t MAX_NAME_LENGTH = 15;



/**

 * The prefix string for environmental variables storing socket FDs created by

 * init.

 */



static constexpr std::string_view ANDROID_SOCKET_PREFIX("ANDROID_SOCKET_");



/**

 * The file descriptor for the Zygote socket opened by init.

 */
@@ -1896,22 +1890,17 @@ static void com_android_internal_os_Zygote_nativeInitNativeState(JNIEnv* env, jc 
   * Obtain file descriptors created by init from the environment.

   */



  std::string android_socket_prefix(ANDROID_SOCKET_PREFIX);

  std::string env_var_name = android_socket_prefix + (is_primary ? "zygote" : "zygote_secondary");

  char* env_var_val = getenv(env_var_name.c_str());



  if (env_var_val != nullptr) {

    gZygoteSocketFD = atoi(env_var_val);

  gZygoteSocketFD =

      android_get_control_socket(is_primary ? "zygote" : "zygote_secondary");

  if (gZygoteSocketFD >= 0) {

    ALOGV("Zygote:zygoteSocketFD = %d", gZygoteSocketFD);

  } else {

    ALOGE("Unable to fetch Zygote socket file descriptor");

  }



  env_var_name = android_socket_prefix + (is_primary ? "usap_pool_primary" : "usap_pool_secondary");

  env_var_val = getenv(env_var_name.c_str());



  if (env_var_val != nullptr) {

    gUsapPoolSocketFD = atoi(env_var_val);

  gUsapPoolSocketFD =

      android_get_control_socket(is_primary ? "usap_pool_primary" : "usap_pool_secondary");

  if (gUsapPoolSocketFD >= 0) {

    ALOGV("Zygote:usapPoolSocketFD = %d", gUsapPoolSocketFD);

  } else {

    ALOGE("Unable to fetch USAP pool socket file descriptor");