tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: 7f4335b30a

Change-Id: I90570e1f80662d0557eb1f30623e609c5bed8716
This commit is contained in:
Etan Cohen 2017-04-05 22:22:35 +00:00 committed by android-build-merger
commit 92c0d5140c
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wifi/1.0/default/hidl_struct_util.cpp
View file

@ -1075,6 +1075,7 @@ bool convertHidlNanPublishRequestToLegacy(
hidl_request.baseConfigs.disableMatchExpirationIndication ? 0x2 : 0x0; hidl_request.baseConfigs.disableMatchExpirationIndication ? 0x2 : 0x0;
legacy_request->recv_indication_cfg |= legacy_request->recv_indication_cfg |=
hidl_request.baseConfigs.disableFollowupReceivedIndication ? 0x4 : 0x0; hidl_request.baseConfigs.disableFollowupReceivedIndication ? 0x4 : 0x0;
legacy_request->recv_indication_cfg |= 0x8;
legacy_request->cipher_type = (unsigned int) hidl_request.baseConfigs.securityConfig.cipherType; legacy_request->cipher_type = (unsigned int) hidl_request.baseConfigs.securityConfig.cipherType;
if (hidl_request.baseConfigs.securityConfig.securityType == NanDataPathSecurityType::PMK) { if (hidl_request.baseConfigs.securityConfig.securityType == NanDataPathSecurityType::PMK) {
legacy_request->key_info.key_type = legacy_hal::NAN_SECURITY_KEY_INPUT_PMK; legacy_request->key_info.key_type = legacy_hal::NAN_SECURITY_KEY_INPUT_PMK;

7
wifi/1.0/default/wifi_legacy_hal.cpp
View file

@ -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&)> std::function<void(const NanPublishTerminatedInd&)>
on_nan_event_publish_terminated_user_callback; on_nan_event_publish_terminated_user_callback;
void onAysncNanEventPublishTerminated(NanPublishTerminatedInd* event) { void onAysncNanEventPublishTerminated(NanPublishTerminatedInd* event) {
@ -1054,6 +1060,7 @@ wifi_error WifiLegacyHal::nanRegisterCallbackHandlers(
return global_func_table_.wifi_nan_register_handler( return global_func_table_.wifi_nan_register_handler(
wlan_interface_handle_, wlan_interface_handle_,
{onAysncNanNotifyResponse, {onAysncNanNotifyResponse,
onAysncNanEventPublishReplied,
onAysncNanEventPublishTerminated, onAysncNanEventPublishTerminated,
onAysncNanEventMatch, onAysncNanEventMatch,
onAysncNanEventMatchExpired, onAysncNanEventMatchExpired,