commit | d79ac4b1c9c961a9c6242ea55dda8d1d9ad4a685 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Dec 04 03:18:06 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 03:18:06 2020 +0000 |
tree | d81ef71b9a72dc226f1019dcadfe8cde12f09530 | |
parent | 7184a231cdb40ea94d87299e9ac8121b7a845017 [diff] | |
parent | 78edd704ab1c60a6ea7d98597be9c2ea6658f5d4 [diff] |
Merge "Revert "libsnapshot: Don't package snapuserd.rc in /vendor/etc."" am: 78edd704ab Original change: https://android-review.googlesource.com/c/platform/system/core/+/1517277 Change-Id: I2690eabe51667f5b12531cea165bad1c30e831df
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()) {