| commit | 398dad25dadeca85ca10ec19773bf96c27989b7d | [log] [tgz] |
|---|---|---|
| author | Wei Wang <wvw@google.com> | Thu Dec 03 20:13:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 03 20:13:48 2020 +0000 |
| tree | 3f5cf8e0b6aba091039910895801b499b7b6cceb | |
| parent | 831c717cdfef2cbb597888fbbc7081a351fe5e2a [diff] | |
| parent | 673b6d47bc7bcfa31d332ed9a884b86f56e6ee81 [diff] |
Merge changes I13c9660a,I41745e7b,I0e6722b8 am: 673b6d47bc Original change: https://android-review.googlesource.com/c/platform/system/core/+/1514907 Change-Id: Ib548fe1bb611a9ffb17dda634010b3f553e9af0e
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()) {