| commit | d759ed844f0ca931144de05285fa98fa8d876dba | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 01 22:26:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 01 22:26:05 2020 +0000 |
| tree | 9b9431519010f3bec7ffc1ca55d19f47e4fbe832 | |
| parent | 5a8869456e062e03850a096830341edf85dd726d [diff] | |
| parent | e52cdbc76028726c17950d4693750d0c1994d5ff [diff] |
Merge changes Ie9da525c,I9911f02c,Iad18af1f,I5f432a3d am: 41c2e6286e am: e52cdbc760 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1506636 Change-Id: I859cfb276c17863dd69998aa9a248915733b698f
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()) {