Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert^2 "[Aware] Support set cluster id in AIDL""

Browse Source
This commit is contained in:
Biswarup Pal
2023-01-09 23:30:52 +00:00
committed by Android (Google) Code Review
parent 6fbf0f9f38 dc7192f7d8
commit e8c390576e
5 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanCapabilities.aidl
View File

@@ -52,4 +52,5 @@ parcelable NanCapabilities {
boolean supports6g;
boolean supportsHe;
boolean supportsPairing;
boolean supportsSetClusterId;
}

1
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanConfigRequestSupplemental.aidl
View File

@@ -40,4 +40,5 @@ parcelable NanConfigRequestSupplemental {
boolean enableRanging;
boolean enableInstantCommunicationMode;
int instantModeChannel;
int clusterId;
}

4
wifi/aidl/android/hardware/wifi/NanCapabilities.aidl
View File

@@ -97,4 +97,8 @@ parcelable NanCapabilities {
* Flag to indicate if NAN pairing is supported.
*/
boolean supportsPairing;
/**
* Flag to indicate if NAN setting cluster ID is supported.
*/
boolean supportsSetClusterId;
}

4
wifi/aidl/android/hardware/wifi/NanConfigRequestSupplemental.aidl
View File

@@ -60,4 +60,8 @@ parcelable NanConfigRequestSupplemental {
* Controls which channel NAN instant communication mode operates on.
*/
int instantModeChannel;
/**
* Controls which cluster to join.
*/
int clusterId;
}

3
wifi/aidl/default/aidl_struct_util.cpp
View File

@@ -1706,6 +1706,8 @@ bool convertAidlNanConfigRequestToLegacy(const NanConfigRequest& aidl_request1,
legacy_request->enable_instant_mode = aidl_request2.enableInstantCommunicationMode;
legacy_request->config_instant_mode_channel = 1;
legacy_request->instant_mode_channel = aidl_request2.instantModeChannel;
legacy_request->config_cluster_id = 1;
legacy_request->cluster_id_val = aidl_request2.clusterId;
return true;
}
@@ -2245,6 +2247,7 @@ bool convertLegacyNanCapabilitiesResponseToAidl(const legacy_hal::NanCapabilitie
aidl_response->supports6g = legacy_response.is_6g_supported;
aidl_response->supportsHe = legacy_response.is_he_supported;
aidl_response->supportsPairing = legacy_response.is_pairing_supported;
aidl_response->supportsSetClusterId = legacy_response.is_set_cluster_id_supported;
return true;
}