DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Id57384c385a6d0bc931caf1054812a469daa9ed0
Change-Id: I22db7e344a9a96bfc16e009624b4896625306e83
This commit is contained in:
Xin Li 2020-12-09 17:44:05 -08:00
commit c30533a761

View file

@ -228,6 +228,11 @@ bool OemCmdHandler(FastbootDevice* device, const std::vector<std::string>& args)
return device->WriteStatus(FastbootResult::FAIL, "Unable to open fastboot HAL");
}
//Disable "oem postwipedata userdata" to prevent user wipe oem userdata only.
if (args[0] == "oem postwipedata userdata") {
return device->WriteStatus(FastbootResult::FAIL, "Unable to do oem postwipedata userdata");
}
Result ret;
auto ret_val = fastboot_hal->doOemCommand(args[0], [&](Result result) { ret = result; });
if (!ret_val.isOk()) {