| commit | 616a325593ff8bd90fc3d1c3f24f909e239da8af | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Tue Dec 01 18:22:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 01 18:22:07 2020 +0000 |
| tree | eda550f49d231af41a6c0a22a4e151bad4092fd4 | |
| parent | d041e1d38db42f21233bd095669d6d68e3e06cdc [diff] | |
| parent | 5a6578b7bddb9ca2cc29bcd7d320403484345584 [diff] |
Merge "Revert "Ramdisk: add metadata dir in ramdisk"" am: 456397830d am: 5a6578b7bd Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513652 Change-Id: I948a57502af113022428644b3c32c369322c8019
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()) {