| commit | a7bdf7c7617faefe38b5b751646ad87ab473fe45 | [log] [tgz] |
|---|---|---|
| author | Biswarup Pal <biswarupp@google.com> | Wed Jan 11 11:02:29 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 11 11:02:29 2023 +0000 |
| tree | 162bcc2c9b8b90e7ea811e201a6e9b0ec44e3a6b | |
| parent | 5388757c806a905536fe8aeb580261b7d7d88c4c [diff] | |
| parent | 319f99f29a1cfbd1c429cefb95302e1321258953 [diff] |
Merge "Add NAN suspension flag to NanCapabilities AIDL"
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanCapabilities.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanCapabilities.aidl index cb5a95c..bb44679 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanCapabilities.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanCapabilities.aidl
@@ -53,4 +53,5 @@ boolean supportsHe; boolean supportsPairing; boolean supportsSetClusterId; + boolean supportsSuspension; }
diff --git a/wifi/aidl/android/hardware/wifi/NanCapabilities.aidl b/wifi/aidl/android/hardware/wifi/NanCapabilities.aidl index 4160176..c1d6201 100644 --- a/wifi/aidl/android/hardware/wifi/NanCapabilities.aidl +++ b/wifi/aidl/android/hardware/wifi/NanCapabilities.aidl
@@ -98,7 +98,11 @@ */ boolean supportsPairing; /** - * Flag to indicate if NAN setting cluster ID is supported. + * Flag to indicate if setting NAN cluster ID is supported. */ boolean supportsSetClusterId; + /** + * Flag to indicate if NAN suspension is supported. + */ + boolean supportsSuspension; }
diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp index ba7d2db..8a7f7e4 100644 --- a/wifi/aidl/default/aidl_struct_util.cpp +++ b/wifi/aidl/default/aidl_struct_util.cpp
@@ -2248,6 +2248,8 @@ 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; + aidl_response->supportsSuspension = legacy_response.is_suspension_supported; + return true; }