| commit | ea70c490fac932179b8f41ea172a2731c76a1f8c | [log] [tgz] |
|---|---|---|
| author | Yi-Yo Chiang <yochiang@google.com> | Tue Aug 01 03:51:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 03:51:01 2023 +0000 |
| tree | 713f944101e37d254a9f667fe768147eca1e9800 | |
| parent | 6b0c2c3cc6a6839dcdb239863ddbdf9d891ef05a [diff] | |
| parent | f6dc8ee31ecd174d7730ed5a92e6d419f5a168ab [diff] |
Merge "libfstab: Unexport InRecovery()" into main am: f6dc8ee31e Original change: https://android-review.googlesource.com/c/platform/system/core/+/2682015 Change-Id: Icf7aa381f4dfe669e6261e47219ce65f86b846e2 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