| commit | 5bdea0d3027f4fdd355f1be660c47a843540cc2d | [log] [tgz] |
|---|---|---|
| author | Yi-Yo Chiang <yochiang@google.com> | Tue Aug 01 04:31:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 04:31:52 2023 +0000 |
| tree | cdfc8abd09d311c036ffd13f837a2a9056a7e472 | |
| parent | 3249f9ff35bc288500229a8b59d39e5b240d4a21 [diff] | |
| parent | ea70c490fac932179b8f41ea172a2731c76a1f8c [diff] |
Merge "libfstab: Unexport InRecovery()" into main am: f6dc8ee31e am: ea70c490fa Original change: https://android-review.googlesource.com/c/platform/system/core/+/2682015 Change-Id: Ie5146dae22e2bf6a0867c483cb07b62e5d7278ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index c3b18c8..678dd69 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h
@@ -109,6 +109,9 @@ namespace android { namespace fs_mgr { + bool UnmapDevice(const std::string& name); +bool InRecovery(); + } // namespace fs_mgr } // namespace android
diff --git a/fs_mgr/include_fstab/fstab/fstab.h b/fs_mgr/include_fstab/fstab/fstab.h index 80b45ba..9cb1546 100644 --- a/fs_mgr/include_fstab/fstab/fstab.h +++ b/fs_mgr/include_fstab/fstab/fstab.h
@@ -131,7 +131,5 @@ // expected name. std::string GetVerityDeviceName(const FstabEntry& entry); -bool InRecovery(); - } // namespace fs_mgr } // namespace android