commit f96f8e8c7f8279fb918bb600195d24c0dd566158
author Xin Li <delphij@google.com> Thu Dec 10 02:18:27 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 10 02:18:27 2020 +0000
tree e3998998b399d409009739f21347875c118d0580
parent 696882455bb856cfb4d042b3fef07fada95891d0
parent c30533a761e88b5c889b013e1bde7c688933891d

Merge "DO NOT MERGE - Merge Android R QPR1"

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