From 11921783d533903ba1045b3ed5a50d5cbabab201 Mon Sep 17 00:00:00 2001 From: Biswarup Pal Date: Mon, 9 Jan 2023 14:10:51 +0000 Subject: [PATCH] Add suspendable option in NanDiscoveryCommonConfig Test: m Bug: 263014869 Change-Id: I0bef43f361a3773ff3e589d44afe4595ddd4e21f --- .../android/hardware/wifi/NanDiscoveryCommonConfig.aidl | 1 + .../android/hardware/wifi/NanDiscoveryCommonConfig.aidl | 6 ++++++ wifi/aidl/default/aidl_struct_util.cpp | 3 +++ 3 files changed, 10 insertions(+) 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 761cdbb643..e84cabfdf9 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 @@ parcelable NanDiscoveryCommonConfig { 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 ca1e01693e..e98658b012 100644 --- a/wifi/aidl/android/hardware/wifi/NanDiscoveryCommonConfig.aidl +++ b/wifi/aidl/android/hardware/wifi/NanDiscoveryCommonConfig.aidl @@ -155,4 +155,10 @@ parcelable NanDiscoveryCommonConfig { */ 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 8a7f7e4ae5..4bd7fbef53 100644 --- a/wifi/aidl/default/aidl_struct_util.cpp +++ b/wifi/aidl/default/aidl_struct_util.cpp @@ -1850,6 +1850,7 @@ bool convertAidlNanPublishRequestToLegacy(const NanPublishRequest& aidl_request, LOG(ERROR) << "convertAidlNanPublishRequestToLegacy: invalid pairing config"; return false; } + legacy_request->enable_suspendability = aidl_request.baseConfigs.enableSessionSuspendability; return true; } @@ -1996,6 +1997,8 @@ bool convertAidlNanSubscribeRequestToLegacy(const NanSubscribeRequest& aidl_requ LOG(ERROR) << "convertAidlNanSubscribeRequestToLegacy: invalid pairing config"; return false; } + legacy_request->enable_suspendability = aidl_request.baseConfigs.enableSessionSuspendability; + return true; }