commit ebcf0925fc8ebfc677fb6b4c8d31d2f4b58ba5cc
author Elliott Hughes <enh@google.com> Wed Dec 09 20:22:29 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 09 20:22:29 2020 +0000
tree 03cc774714b51f29feef6647ed9ec51e683332b8
parent e495bce0af9ddf9c254bb521a3dba83065d338fa
parent 2acdc9de3378d2b74b16265a9a3d8c9c08b397e5

Merge "Use freecon() with getcon()/getfilecon()." am: 2acdc9de33

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I023300186b76bba84632d278e454987688a9b325

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