| commit | 5982334f5382f23574c4063863a46f7f43f88ce7 | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Wed Dec 02 04:20:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 02 04:20:25 2020 +0000 |
| tree | 88fade1e5b87530f6fe539692bc4bcfd6d3d4561 | |
| parent | 5d7d398f8f34d57fe817ebee87a0952ee9ef3f06 [diff] | |
| parent | c58d20321a8e31598050beb3da513dfd595c6389 [diff] |
Merge "trusty-ut-ctrl: Make it as binary" am: 36d45bbfd5 am: c58d20321a Original change: https://android-review.googlesource.com/c/platform/system/core/+/1496887 Change-Id: I2a23933fddb91556f210f8b3b9d62b681351c1a8
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()) {