commit a95f900d69270a9a9406c2fe054369060d772d16
author Tom Cherry <tomcherry@google.com> Wed Dec 09 16:06:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 09 16:06:38 2020 +0000
tree 8f92198bbf5fa803403b9bc2ffbb455cd3f065a6
parent 877e2374a7cc83884fb949df91a944e3c0fb4d19
parent 6cf369550247d2bca74a4139600ffafa2e9d9eea

Merge "ueventd: add no_fnm_pathname option" am: 6cf3695502

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1518705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bf82b3439e15e282bef89a9ecc40663796006f6

fastboot/device/commands.cpp

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()) {