diff options
5 files changed, 8 insertions, 4 deletions
diff --git a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl index 826b0f1eb1..53d5770e7f 100644 --- a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl +++ b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl @@ -64,7 +64,7 @@ interface ISupplicantStaIface { void reconnect(); void registerCallback(in android.hardware.wifi.supplicant.ISupplicantStaIfaceCallback callback); void setQosPolicyFeatureEnabled(in boolean enable); - void sendQosPolicyResponse(in boolean morePolicies, in android.hardware.wifi.supplicant.QosPolicyStatus[] qosPolicyStatusList); + void sendQosPolicyResponse(in int qosPolicyRequestId, in boolean morePolicies, in android.hardware.wifi.supplicant.QosPolicyStatus[] qosPolicyStatusList); void removeAllQosPolicies(); void removeDppUri(in int id); void removeExtRadioWork(in int id); diff --git a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl index b36cd84fc9..46c8000a64 100644 --- a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl +++ b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl @@ -62,5 +62,5 @@ interface ISupplicantStaIfaceCallback { oneway void onWpsEventPbcOverlap(); oneway void onWpsEventSuccess(); oneway void onQosPolicyReset(); - oneway void onQosPolicyRequest(in android.hardware.wifi.supplicant.QosPolicyData[] qosPolicyData); + oneway void onQosPolicyRequest(in int qosPolicyRequestId, in android.hardware.wifi.supplicant.QosPolicyData[] qosPolicyData); } diff --git a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl index c98a9a1cbc..9edf210be8 100644 --- a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl +++ b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl @@ -418,6 +418,7 @@ interface ISupplicantStaIface { * sends a solicited (uses the ongoing DSCP request as dialog token) DSCP * response. Otherwise, sends an unsolicited DSCP response. * + * @param qosPolicyRequestId Dialog token to identify the request. * @param morePolicies Flag to indicate more QoS policies can be accommodated. * @param qosPolicyStatusList QoS policy status info for each QoS policy id. * @throws ServiceSpecificException with one of the following values: @@ -425,7 +426,8 @@ interface ISupplicantStaIface { * |SupplicantStatusCode.FAILURE_UNKNOWN|, * |SupplicantStatusCode.FAILURE_UNSUPPORTED| */ - void sendQosPolicyResponse(in boolean morePolicies, in QosPolicyStatus[] qosPolicyStatusList); + void sendQosPolicyResponse(in int qosPolicyRequestId, in boolean morePolicies, + in QosPolicyStatus[] qosPolicyStatusList); /** * Indicate removal of all active QoS policies configured by the AP. diff --git a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl index 5479441052..895bc50436 100644 --- a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl +++ b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl @@ -298,7 +298,8 @@ oneway interface ISupplicantStaIfaceCallback { /** * Used to indicate a DSCP request was received from the AP. * + * @param qosPolicyRequestId Dialog token to identify the request. * @param qosPolicyData QoS policies info requested by the AP. */ - void onQosPolicyRequest(in QosPolicyData[] qosPolicyData); + void onQosPolicyRequest(in int qosPolicyRequestId, in QosPolicyData[] qosPolicyData); } diff --git a/wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp b/wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp index d991e39081..1c00ec7c46 100644 --- a/wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp +++ b/wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp @@ -201,6 +201,7 @@ class SupplicantStaIfaceCallback : public BnSupplicantStaIfaceCallback { } ::ndk::ScopedAStatus onQosPolicyReset() override { return ndk::ScopedAStatus::ok(); } ::ndk::ScopedAStatus onQosPolicyRequest( + int32_t /* qosPolicyRequestId */, const std::vector<::aidl::android::hardware::wifi::supplicant :: QosPolicyData /* qosPolicyData */>&) override { return ndk::ScopedAStatus::ok(); |