init: remove FDE workaround from load_persist_props
FDE is no longer supported, so this workaround is no longer needed.
Bug: 191796797
Change-Id: I059b07035b2158fe84e19544f03aab48de787e62
diff --git a/init/builtins.cpp b/init/builtins.cpp
index 364744e..e9c717a 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1094,17 +1094,6 @@
}
static Result<void> do_load_persist_props(const BuiltinArguments& args) {
- // Devices with FDE have load_persist_props called twice; the first time when the temporary
- // /data partition is mounted and then again once /data is truly mounted. We do not want to
- // read persistent properties from the temporary /data partition or mark persistent properties
- // as having been loaded during the first call, so we return in that case.
- std::string crypto_state = android::base::GetProperty("ro.crypto.state", "");
- std::string crypto_type = android::base::GetProperty("ro.crypto.type", "");
- if (crypto_state == "encrypted" && crypto_type == "block") {
- static size_t num_calls = 0;
- if (++num_calls == 1) return {};
- }
-
SendLoadPersistentPropertiesMessage();
start_waiting_for_property("ro.persistent_properties.ready", "true");