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

Commit 2bc5f0b3 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "fs_mgr: use ro.persistent_properties.ready" am: 3f04e9e3 am: 3ae60868 

am: 543e9515

Change-Id: Ia99eeb2a702eda474623100993bb4b4939125236
parents 4d80dcef 543e9515

fs_mgr/fs_mgr_overlayfs.cpp

+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) {