commit | 21f503b3fc41581b2d1ed75e1007283e0125d2f6 | [log] [tgz] |
---|---|---|
author | Tri Vo <trong@google.com> | Tue Nov 24 21:19:06 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 24 21:19:06 2020 +0000 |
tree | e50d513e9f49c71bcf3ad4de4932afbcc879e8fd | |
parent | 3d23c4c3f46595e9d30c6e6ca6ba80ec2210a1ea [diff] | |
parent | 0b1ef9689888e0ef6dbd0eec4304a09898ba62f7 [diff] |
Merge changes Id77b87bb,I56a15c80 am: 9763f21565 am: 0b1ef96898 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1504100 Change-Id: I09c9f01c24eb0944e2410136d9f3834fd65f5598
diff --git a/fastboot/device/commands.cpp b/fastboot/device/commands.cpp index 4601960..2b2a0bf 100644 --- a/fastboot/device/commands.cpp +++ b/fastboot/device/commands.cpp
@@ -228,6 +228,11 @@ 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()) {