| commit | de50d73084724fccaff199c260e61f1ecdd463e5 | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Mon Nov 30 01:06:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 30 01:06:15 2020 +0000 |
| tree | aa30fa1dce21b48465c9f9b3c06fee6e88ae56f6 | |
| parent | 812fa93bb1315b1de5f2481632e8850770a82277 [diff] | |
| parent | e29076bc155dafb2ba56b7b496b58d1871361467 [diff] |
Merge "trusty: Fuzzer for Confirmationui TA" am: b0db51d36e am: e29076bc15 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513530 Change-Id: Iabf5e7012552ee24468cee401bad3ae6ee410a7d
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()) {