| commit | f23bb0a4dff7c6c464c18b6edbf498c3e0964401 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Nov 30 21:29:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 30 21:29:04 2020 +0000 |
| tree | 002223ef38908030a654a6bec898432db2e62fe8 | |
| parent | de50d73084724fccaff199c260e61f1ecdd463e5 [diff] | |
| parent | df373f6e5d0940f2954bc4669985ad18d675f957 [diff] |
Merge "Adjust to MapInfo to new api." am: 8255631fa9 am: df373f6e5d Original change: https://android-review.googlesource.com/c/platform/system/core/+/1509951 Change-Id: I584e0afe94985d9decf915131796a8a53be67cc3
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()) {