| commit | f512b499b812fd9e40c25be9329f7ddc60550a7c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Dec 07 18:12:31 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 07 18:12:31 2020 +0000 |
| tree | 679dd9d581a272560364ca76fa202e5e8d4f3880 | |
| parent | b7ab0c71a1eaa8d999aa87b8902deb8082dde041 [diff] | |
| parent | 77692aeea28a0781c0c918673ece565c28f15643 [diff] |
Merge "Make libcutils' thread local stuff more clearly deprecated." am: 77692aeea2 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1515640 Change-Id: I2eaec4711ffb72d9ab34bbe0c2c69eec8ad9a4cc
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()) {