| commit | 5be39f6b81fab4deb4e0ac6ebc04030c1ac5ef07 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Fri Dec 04 05:08:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 05:08:43 2020 +0000 |
| tree | 9eb5fcae7cd85a82ea098db10f9cccc45d0c14ff | |
| parent | 9d879b847f778c01d536785d84f238cf76cd5fca [diff] | |
| parent | 2e67e77752013bbdb544ed354f043ba79be1b9fd [diff] |
Merge changes Ia3aa8b3b,I6e8b80a8,I28552889 am: 2e67e77752 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1510244 Change-Id: I4f8df82e6d7419a43d666132199705056221d5dd
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()) {