| commit | 8ff7a7370f950d905e2b74f7dd90768e5e90bb03 | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Mon Nov 23 21:22:31 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 23 21:22:31 2020 +0000 |
| tree | e8f4993f1f3efd631743a0f5d57be35df694daf5 | |
| parent | 26adfebc38596d4b2471b557ba3beb4d1e27f87f [diff] | |
| parent | 61714d22dd3c69044cbf75b5ce237e8a25b526c4 [diff] |
Merge changes Ibeffa4a3,Ibce3bac9 am: d9a6144435 am: 61714d22dd Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507551 Change-Id: Ie857e8cfcb43a9f3e8cdf748c4d3c6b35c3047dd
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()) {