| commit | 0e05439db2f913b594c8fcbd822caf309d6217e2 | [log] [tgz] |
|---|---|---|
| author | Biswarup Pal <biswarupp@google.com> | Thu Jan 12 10:55:41 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 12 10:55:41 2023 +0000 |
| tree | 1889a15af3c6ae7ddb19e49b57e0570413806abc | |
| parent | e3d6ae8e98eec88d07ee1d8b46c2ac41da252b6e [diff] | |
| parent | 11921783d533903ba1045b3ed5a50d5cbabab201 [diff] |
Merge "Add suspendable option in NanDiscoveryCommonConfig"
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; }