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

Commit ddf34ebc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27179585']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27179585'] into sparse-11788577-L22000030003487043.
SPARSE_CHANGE: I74e0c0cba90ef6945204bcd3ac3423c631690148

Change-Id: Ib564db12c78d677f5cf28f92926d704cb980b58f
parents 1f97cf3f 2367fe39

core/jni/com_android_internal_os_Zygote.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1828,10 +1828,10 @@ static void BindMountSyspropOverride(fail_fn_t fail_fn, JNIEnv* env) { 
  std::string source = "/dev/__properties__/appcompat_override";

  std::string target = "/dev/__properties__";

  if (access(source.c_str(), F_OK) != 0) {

    fail_fn(CREATE_ERROR("Error accessing %s: %s", source.c_str(), strerror(errno)));

      return;

  }

  if (access(target.c_str(), F_OK) != 0) {

    fail_fn(CREATE_ERROR("Error accessing %s: %s", target.c_str(), strerror(errno)));

      return;

  }

  BindMount(source, target, fail_fn);

  // Reload the system properties file, to ensure new values are read into memory