| commit | 408ba4f9ae74b6a35397910d99e1cfdfba52894a | [log] [tgz] |
|---|---|---|
| author | Yi-Yo Chiang <yochiang@google.com> | Tue Aug 01 07:00:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 07:00:30 2023 +0000 |
| tree | 90f21df3e4da8d566d2096ed150acb132a61c96e | |
| parent | e2c091a772dbbc3b3c2d100ae30779e0ef636b32 [diff] | |
| parent | 9fc8727947c8df296a88c1d16584587e5d3f4368 [diff] |
Merge "libfstab: Unexport InRecovery()" into main am: f6dc8ee31e am: ea70c490fa am: 5bdea0d302 am: 37a5342b1e am: 9fc8727947 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2682015 Change-Id: I3fc1d72bc5f4db8ddd479e821d8822ef0c50fdb4 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