| commit | 47c14944a1de8550486515fa11582d6b5e72f4f9 | [log] [tgz] |
|---|---|---|
| author | Rick Yiu <rickyiu@google.com> | Mon Nov 23 14:42:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 23 14:42:59 2020 +0000 |
| tree | 815362ae15626db80346047f172e55449ba55af7 | |
| parent | 597e503df675282ac5014eace078183673cc8b01 [diff] | |
| parent | 609c77f72775eebe8fb35a0b2858ac5a79c403fe [diff] |
Merge "rootdir/init.rc: Remove duplicated settings" am: e3d0307e34 am: 609c77f727 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1506808 Change-Id: I07eb8ad4ce4397848317869ef3cd408252abb497
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()) {