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

Commit ec25f8c5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "overlayfs: Fix -user build break" am: 7d075866 am: 859473ce am:... 

Merge "overlayfs: Fix -user build break" am: 7d075866 am: 859473ce am: 9f027869 am: e2b0cbfa am: 3ad9d1c7

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2222075



Change-Id: I3a6321e10982d2776c0d6f2c8f50186ef13fc891
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8625de5 3ad9d1c7

fs_mgr/fs_mgr_overlayfs.cpp

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ bool fs_mgr_overlayfs_setup(const char*, bool*, bool) { 
    return false;

}



bool fs_mgr_overlayfs_teardown(const char*, bool*) {

    return false;

OverlayfsTeardownResult fs_mgr_overlayfs_teardown(const char*, bool*) {

    return OverlayfsTeardownResult::Ok;

}



bool fs_mgr_overlayfs_is_setup() {