From fde69fbd8ab174dbc9f828785c435a7d52311386 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 10 Mar 2022 22:13:39 +0000 Subject: Remove support for converting from FDE to FBE Devices that launched with Android 10 or later require FBE (File Based Encryption) from the beginning, so there's no need to support converting to FBE after the fact anymore. This was only ever a developer option, so it probably wasn't used much. And in any case, it's not used anymore, as isConvertibleToFBE() is hard-coded to return false. Besides the fact that FBE has been required for several releases now, this functionality was only ever available on devices that use FDE (Full Disk Encryption), but FDE support has been removed from Android. Therefore, remove this unused code. Bug: 208476087 Change-Id: I1f56c8e05fb3fba09aab4bf5f8609b0f552b8999 --- install/adb_install.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install/adb_install.cpp') diff --git a/install/adb_install.cpp b/install/adb_install.cpp index 5cba7b67c..b12e52944 100644 --- a/install/adb_install.cpp +++ b/install/adb_install.cpp @@ -369,7 +369,7 @@ InstallResult ApplyFromAdb(Device* device, bool rescue_mode, Device::BuiltinActi "to the device with \"adb sideload \"...\n"); } else { command_map.emplace(MinadbdCommand::kWipeData, [&device]() { - bool result = WipeData(device, false); + bool result = WipeData(device); return std::make_pair(result, true); }); command_map.emplace(MinadbdCommand::kNoOp, []() { return std::make_pair(true, true); }); -- cgit v1.2.3