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

Commit 6d0b6fa3 authored by Nate Myren's avatar Nate Myren
Browse files

Do not crash if zygote fails to find appcompat system properties 

Simply return, rather than crashing the app

Fixes: 338244859
Test: manual
Change-Id: I74e0c0cba90ef6945204bcd3ac3423c631690148
parent 8b7af664

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