From d604080c588943fc6704411e9bdb6f01027f474b Mon Sep 17 00:00:00 2001
From: Hridya Valsaraju <hridya@google.com>
Date: Fri, 21 Sep 2018 22:38:57 +0000
Subject: [PATCH] Revert "Add command to pass oem commands to HAL"

This reverts commit ddaa8ecb379479a3450c954161df33fda1348685.

Reason for revert: This needs to go to master first to prevent build breaks.

Change-Id: I6418f1ba5dab492dc11b8c24e5d83ea7257d9699
---
 fastboot/1.0/IFastboot.hal | 10 ----------
 fastboot/1.0/types.hal     |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/fastboot/1.0/IFastboot.hal b/fastboot/1.0/IFastboot.hal
index 5e42c17042..653fd79ef5 100644
--- a/fastboot/1.0/IFastboot.hal
+++ b/fastboot/1.0/IFastboot.hal
@@ -29,14 +29,4 @@ interface IFastboot {
      *     reformatting.
      */
     getPartitionType(string partitionName) generates (FileSystemType type, Result result);
-
-    /**
-     * Executes a fastboot OEM command.
-     *
-     * @param oemCmdArgs The oem command that is passed to the fastboot HAL.
-     * @response result Returns the status SUCCESS if the operation is successful,
-     *     INVALID_ARGUMENT for bad arguments,
-     *     FAILURE_UNKNOWN for an invalid/unsupported command.
-     */
-    doOemCommand(string oemCmd) generates (Result result);
 };
diff --git a/fastboot/1.0/types.hal b/fastboot/1.0/types.hal
index 3fbe63959c..8453deb2a4 100644
--- a/fastboot/1.0/types.hal
+++ b/fastboot/1.0/types.hal
@@ -53,9 +53,9 @@ enum FileSystemType : uint8_t {
 struct Result {
     Status status;
     /**
-     * Message pertaining to the status. It must be a failure message for
+     * Error message pertaining to the status. It must be a failure message for
      * Status FAILURE_UNKNOWN/NOT_SUPPORTED or an informative message for
      * Status SUCCESS.
      */
-    string message;
+    string error;
 };