wifi(interface): Fix compilation failure

Changes in the CL:
a) Unions are not allowed in the HIDL generated code that is going to be
used in java.
b) Few RTT constants were defined twice in the legacy rtt.h. One set
as enums, the other set as #define's. Remove the duplicated values in
the HIDL interface.

Bug: 31991076
Bug: 31991232
Test: mmm -j32 hardware/interfaces/wifi/1.0/
Change-Id: I03db70c7b89c0be53a7754ab8b34a19ad2c6e536

wifi/1.0/IWifiNanIfaceEventCallback.hal

@@ -21,9 +21,36 @@ package android.hardware.wifi@1.0;
  */
 interface IWifiNanIfaceEventCallback {
   /**
-   * NotifyResponse invoked to notify the status of the Request.
+   * Callback invoked to notify the status of the Publish Request.
+   *
+   * @param cmdId command Id corresponding to the original request.
+   * @param rspData Message Data.
    */
-  oneway notifyResponse(CommandId id, NanResponseMsg rspData);
+  oneway notifyPublishResponse(CommandId id, NanPublishResponseMsg rspData);
+
+  /**
+   * Callback invoked to notify the status of the Subscribe Request.
+   *
+   * @param cmdId command Id corresponding to the original request.
+   * @param rspData Message Data.
+   */
+  oneway notifySubscribeResponse(CommandId id, NanSubscribeResponseMsg rspData);
+
+  /**
+   * Callback invoked to notify the status of the Data Path Request.
+   *
+   * @param cmdId command Id corresponding to the original request.
+   * @param rspData Message Data.
+   */
+  oneway notifyDataPathResponse(CommandId id, NanDataPathResponseMsg rspData);
+
+  /**
+   * Callback invoked to notify the status of the Capability Request.
+   *
+   * @param cmdId command Id corresponding to the original request.
+   * @param rspData Message Data.
+   */
+  oneway notifyCapabilitiesResponse(CommandId id, NanCapabilitiesResponseMsg rspData);
 
   /**
    * Callbacks for the various asynchornous NAN Events.

wifi/1.0/types.hal

@@ -1178,6 +1178,25 @@ enum NanStatusType : uint32_t {
   NDP_VENDOR_SPECIFIC_ERROR = 9500,
 };
 
+/**
+ * NAN Response message header
+ */
+struct NanResponseMsgHeader {
+  /**
+   * Contains the result code.
+   */
+  NanStatusType status;
+  /**
+   * For error returns the value is returned which was in error.
+   * TODO(b/32207606): Find all the error values.
+   */
+  uint32_t value;
+  /**
+   * ResponseType Definitions.
+   */
+  NanResponseType responseType;
+};
+
 /**
  * Publish Response Message structure.
  */
@@ -1185,6 +1204,15 @@ struct NanPublishResponse {
   uint16_t publishId;
 };
 
+/**
+ * NAN Publish Response Messages.
+ */
+struct NanPublishResponseMsg {
+  NanResponseMsgHeader header;
+  NanPublishResponse body;
+};
+
+
 /**
  * Subscribe Response Message structure.
  */
@@ -1192,10 +1220,18 @@ struct NanSubscribeResponse {
   uint16_t subscribeId;
 };
 
+/**
+ * NAN Subscribe Response Messages.
+ */
+struct NanSubscribeResponseMsg {
+  NanResponseMsgHeader header;
+  NanSubscribeResponse body;
+};
+
 /**
  * Response returned for Initiators Data request.
  */
-struct NanDataPathRequestResponse {
+struct NanDataPathResponse {
   /**
    * Unique token Id generated on the initiator
    * side used for a NDP session between two NAN devices
@@ -1204,9 +1240,17 @@ struct NanDataPathRequestResponse {
 };
 
 /**
- * NDP Capabilites info.
+ * NAN Data Path Response Messages.
  */
-struct NanCapabilities {
+struct NanDataPathResponseMsg {
+  NanResponseMsgHeader header;
+  NanDataPathResponse body;
+};
+
+/**
+ * NDP Capabilites response.
+ */
+struct NanCapabilitiesResponse {
   uint32_t maxConcurrentClusters;
   uint32_t maxPublishes;
   uint32_t maxSubscribes;
@@ -1223,32 +1267,11 @@ struct NanCapabilities {
 };
 
 /**
- * NAN Response Message body.
+ * NAN Capabilities Response Messages.
  */
-union NanResponseMsgBody {
-    NanPublishResponse publishResponse;
-    NanSubscribeResponse subscribeResponse;
-    NanDataPathRequestResponse dataRequestResponse;
-    NanCapabilities nanCapabilities;
-};
-
-/**
- * NAN Response Messages.
- */
-struct NanResponseMsg {
-  /**
-   * Contains the result code.
-   */
-  NanStatusType status;
-  /**
-   * For error returns the value is returned which was in error.
-   */
-  uint32_t value;
-  /**
-   * ResponseType Definitions.
-   */
-  NanResponseType responseType;
-  NanResponseMsgBody body;
+struct NanCapabilitiesResponseMsg {
+  NanResponseMsgHeader header;
+  NanCapabilitiesResponse body;
 };
 
 /**
@@ -1571,21 +1594,6 @@ struct NanTransmitFollowupInd {
  * RTT specific types.
  * TODO(b/32159498): Move to a separate rtt_types.hal.
  */
-/**
- * Constants used in the RTT interface.
- */
-enum RttConstants : uint32_t {
-  PREAMBLE_LEGACY = 0x1,
-  PREAMBLE_HT = 0x2,
-  PREAMBLE_VHT = 0x4,
-  BW_5_SUPPORT = 0x1,
-  BW_10_SUPPORT = 0x2,
-  BW_20_SUPPORT = 0x4,
-  BW_40_SUPPORT = 0x8,
-  BW_80_SUPPORT = 0x10,
-  BW_160_SUPPORT = 0x20,
-};
-
 /**
  * Ranging status.
  */
@@ -1896,11 +1904,13 @@ struct RttCapabilities {
    */
   bool responderSupported;
   /**
-   * bit mask indicates what preamble is supported by initiator.
+   * Bit mask indicates what preamble is supported by initiator.
+   * Combination of |RttPreamble| values.
    */
   uint8_t preambleSupport;
   /**
-   * bit mask indicates what BW is supported by initiator.
+   * Bit mask indicates what BW is supported by initiator.
+   * Combination of |RttBw| values.
    */
   uint8_t bwSupport;
   /**