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

Commit 7f4335b3 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[AWARE] Legacy HAL update: reduce host wakeup" am: 6ae199ef 

am: c6e4705e

Change-Id: Id7c2cf6440b21f14d4fd766cc82edc8a92a76e99
parents 93aa1c0f c6e4705e

wifi/1.0/default/hidl_struct_util.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1067,6 +1067,7 @@ bool convertHidlNanPublishRequestToLegacy( 
        hidl_request.baseConfigs.disableMatchExpirationIndication ? 0x2 : 0x0;

  legacy_request->recv_indication_cfg |=

        hidl_request.baseConfigs.disableFollowupReceivedIndication ? 0x4 : 0x0;

  legacy_request->recv_indication_cfg |= 0x8;

  legacy_request->cipher_type = (unsigned int) hidl_request.baseConfigs.securityConfig.cipherType;

  if (hidl_request.baseConfigs.securityConfig.securityType == NanDataPathSecurityType::PMK) {

    legacy_request->key_info.key_type = legacy_hal::NAN_SECURITY_KEY_INPUT_PMK;

wifi/1.0/default/wifi_legacy_hal.cpp

+7 −0
Original line number Diff line number Diff line
@@ -180,6 +180,12 @@ void onAysncNanNotifyResponse(transaction_id id, NanResponseMsg* msg) { 
  }

}



std::function<void(const NanPublishRepliedInd&)>

    on_nan_event_publish_replied_user_callback;

void onAysncNanEventPublishReplied(NanPublishRepliedInd* /* event */) {

  LOG(ERROR) << "onAysncNanEventPublishReplied triggered";

}



std::function<void(const NanPublishTerminatedInd&)>

    on_nan_event_publish_terminated_user_callback;

void onAysncNanEventPublishTerminated(NanPublishTerminatedInd* event) {
@@ -1054,6 +1060,7 @@ wifi_error WifiLegacyHal::nanRegisterCallbackHandlers( 
  return global_func_table_.wifi_nan_register_handler(

      wlan_interface_handle_,

      {onAysncNanNotifyResponse,

       onAysncNanEventPublishReplied,

       onAysncNanEventPublishTerminated,

       onAysncNanEventMatch,

       onAysncNanEventMatchExpired,