| commit | 26adfebc38596d4b2471b557ba3beb4d1e27f87f | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Mon Nov 23 19:34:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 23 19:34:58 2020 +0000 |
| tree | 75af68d3858c07be13799198a3e065bc5a736b39 | |
| parent | 47c14944a1de8550486515fa11582d6b5e72f4f9 [diff] | |
| parent | 4902c90f750132ca5f0af437d43d2cf5c51603df [diff] |
Merge changes Ice594cce,I9a87f988 am: d7f31801c0 am: 4902c90f75 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507922 Change-Id: Iaea67d1389619f06f39e95d48613901a53cc3d98
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()) {