| commit | e2b0cbfaa29aaef042a927eb102c0def44dad67b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Sep 22 00:19:08 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 22 00:19:08 2022 +0000 |
| tree | 044d4538584313ab465df84cfd57c3a48a0cdfec | |
| parent | 756a11171f2ccaa245070a415975c32aedd7a95a [diff] | |
| parent | 9f027869414e3f4bbf889a76ffa7a565337a67bf [diff] |
Merge "overlayfs: Fix -user build break" am: 7d07586695 am: 859473ce28 am: 9f02786941 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2222075 Change-Id: I854ca739c160ed90a9bb8989f9618b72cd0e6fcc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp index 2ef3068..1d5a04b 100644 --- a/fs_mgr/fs_mgr_overlayfs.cpp +++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -102,8 +102,8 @@ 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() {