Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95e7e5a0 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[AWARE] Update capabilties" am: 10569b1b 

am: dbaff934

Change-Id: I874de1d8668ea0df50d0c84357469e719841c4f8
parents 2e14b7cc dbaff934

wifi/1.0/default/hidl_struct_util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ bool convertLegacyNanCapabilitiesResponseToHidl( 
  hidl_response->maxTotalMatchFilterLen = legacy_response.max_total_match_filter_len;

  hidl_response->maxServiceSpecificInfoLen = legacy_response.max_service_specific_info_len;

  // TODO: b/35193423 add support for extended service specific info

  hidl_response->maxVsaDataLen = legacy_response.max_vsa_data_len;

  hidl_response->maxExtendedServiceSpecificInfoLen = 0;

  hidl_response->maxNdiInterfaces = legacy_response.max_ndi_interfaces;

  hidl_response->maxNdpSessions = legacy_response.max_ndp_sessions;

  hidl_response->maxAppInfoLen = legacy_response.max_app_info_len;

wifi/1.0/types.hal

+0 −4
Original line number Diff line number Diff line
@@ -1288,10 +1288,6 @@ struct NanCapabilities { 
   * Maximum length (in bytes) of the extended service specific info field.

   */

  uint32_t maxExtendedServiceSpecificInfoLen;

  /**

   * Maximum length (in bytes) of vendor-specific (VSA) data.

   */

  uint32_t maxVsaDataLen;

  /**

   * Maximum number of data interfaces (NDI) which can be created concurrently on the device.

   */