| commit | 11921783d533903ba1045b3ed5a50d5cbabab201 | [log] [tgz] |
|---|---|---|
| author | Biswarup Pal <biswarupp@google.com> | Mon Jan 09 14:10:51 2023 +0000 |
| committer | Biswarup Pal <biswarupp@google.com> | Wed Jan 11 14:52:57 2023 +0000 |
| tree | 4d1ceea146d8ca3507db99195ca3e39d708c1a26 | |
| parent | 65ea0b93453a9fbea8f2e195d805f6633adfe562 [diff] |
Add suspendable option in NanDiscoveryCommonConfig Test: m Bug: 263014869 Change-Id: I0bef43f361a3773ff3e589d44afe4595ddd4e21f
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDiscoveryCommonConfig.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDiscoveryCommonConfig.aidl index 761cdbb..e84cabf 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDiscoveryCommonConfig.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDiscoveryCommonConfig.aidl
@@ -54,4 +54,5 @@ android.hardware.wifi.NanRangingIndication configRangingIndications; char distanceIngressCm; char distanceEgressCm; + boolean enableSessionSuspendability; }
diff --git a/wifi/aidl/android/hardware/wifi/NanDiscoveryCommonConfig.aidl b/wifi/aidl/android/hardware/wifi/NanDiscoveryCommonConfig.aidl index ca1e016..e98658b 100644 --- a/wifi/aidl/android/hardware/wifi/NanDiscoveryCommonConfig.aidl +++ b/wifi/aidl/android/hardware/wifi/NanDiscoveryCommonConfig.aidl
@@ -155,4 +155,10 @@ */ char distanceIngressCm; char distanceEgressCm; + /** + * Specifies whether suspension can be possible in this discovery session. + * The request would fail if |enableSessionSuspendability| is true but + * |NanCapabilities.supportsSuspension| is false. + */ + boolean enableSessionSuspendability; }
diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp index 8a7f7e4..4bd7fbe 100644 --- a/wifi/aidl/default/aidl_struct_util.cpp +++ b/wifi/aidl/default/aidl_struct_util.cpp
@@ -1850,6 +1850,7 @@ LOG(ERROR) << "convertAidlNanPublishRequestToLegacy: invalid pairing config"; return false; } + legacy_request->enable_suspendability = aidl_request.baseConfigs.enableSessionSuspendability; return true; } @@ -1996,6 +1997,8 @@ LOG(ERROR) << "convertAidlNanSubscribeRequestToLegacy: invalid pairing config"; return false; } + legacy_request->enable_suspendability = aidl_request.baseConfigs.enableSessionSuspendability; + return true; }