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

Commit 5f6b0697 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

fs_mgr: use ro.persistent_properties.ready

Replace more complicated logic that determines that persistent
properties are now valid with a simple check of
ro.persistent_properties.ready.

Test: manual
Bug: 109821005
Change-Id: I3e43df8283cb97abbf5c0333e64db4ad11703798
parent 890c5382
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -65,11 +65,10 @@ namespace {
// acceptable overlayfs backing storage
const auto kOverlayMountPoint = "/cache"s;

// return true if everything is mounted, but before adb is started.  At
// 'trigger firmware_mounts_complete' after 'trigger load_persist_props_action'.
// Return true if everything is mounted, but before adb is started.  Right
// after 'trigger load_persist_props_action' is done.
bool fs_mgr_boot_completed() {
    return !android::base::GetProperty("ro.boottime.init", "").empty() &&
           !!access("/dev/.booting", F_OK);
    return android::base::GetBoolProperty("ro.persistent_properties.ready", false);
}

bool fs_mgr_is_dir(const std::string& path) {