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

[Aware] Support set cluster id in AIDL

Browse source 
Bug: 262872131
Test: ates android.net.wifi
Change-Id: I08000c8200861c7fed191a079c5348158de41771
This commit is contained in:
Sherri Lin 2022-12-30 16:17:47 +01:00
parent f004adf289
commit f6abe359a8
5 changed files with 13 additions and 0 deletions
Show stats 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;
}