Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master (ed5d1a98) · Commits · e / os / android_system_core

fastboot/device/commands.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -228,6 +228,11 @@ bool OemCmdHandler(FastbootDevice* device, const std::vector<std::string>& args)
		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()) {