ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 6864616 from 46ef208603 to rvc-qpr1-release

Browse source 
Change-Id: I967275839fdbd3552ca855c92ecd6c16be45a676
This commit is contained in:
android-build-team Robot 2020-09-25 23:07:36 +00:00
commit fc6366c953
1 changed files with 50 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
fastboot/device/commands.cpp
View file

@ -164,6 +164,39 @@ bool GetVarHandler(FastbootDevice* device, const std::vector<std::string>& args)
return device->WriteOkay(message);
}
bool OemPostWipeData(FastbootDevice* device) {
auto fastboot_hal = device->fastboot_hal();
if (!fastboot_hal) {
return false;
}
Result ret;
// Check whether fastboot_hal support "oem postwipedata" API or not.
const std::string checkPostWipeDataCmd("oem postwipedata support");
auto check_cmd_ret_val = fastboot_hal->doOemCommand(checkPostWipeDataCmd,
[&](Result result) { ret = result; });
if (!check_cmd_ret_val.isOk()) {
return false;
}
if (ret.status != Status::SUCCESS) {
return false;
}
const std::string postWipeDataCmd("oem postwipedata userdata");
auto ret_val = fastboot_hal->doOemCommand(postWipeDataCmd,
[&](Result result) { ret = result; });
if (!ret_val.isOk()) {
return false;
}
if (ret.status != Status::SUCCESS) {
device->WriteStatus(FastbootResult::FAIL, ret.message);
} else {
device->WriteStatus(FastbootResult::OKAY, "Erasing succeeded");
}
return true;
}
bool EraseHandler(FastbootDevice* device, const std::vector<std::string>& args) {
if (args.size() < 2) {
return device->WriteStatus(FastbootResult::FAIL, "Invalid arguments");
@ -184,7 +217,18 @@ bool EraseHandler(FastbootDevice* device, const std::vector<std::string>& args)
return device->WriteStatus(FastbootResult::FAIL, "Partition doesn't exist");
}
if (wipe_block_device(handle.fd(), get_block_device_size(handle.fd())) == 0) {
return device->WriteStatus(FastbootResult::OKAY, "Erasing succeeded");
//Perform oem PostWipeData if Android userdata partition has been erased
bool support_oem_postwipedata = false;
if (partition_name == "userdata") {
support_oem_postwipedata = OemPostWipeData(device);
}
if (!support_oem_postwipedata) {
return device->WriteStatus(FastbootResult::OKAY, "Erasing succeeded");
} else {
//Write device status in OemPostWipeData(), so just return true
return true;
}
}
return device->WriteStatus(FastbootResult::FAIL, "Erasing failed");
}
@ -195,6 +239,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()) {