Merge "wifi: Add qosPolicyRequestId in definition of supplicant AIDL APIs" into tm-dev

This commit is contained in:
Gabriel Biren
2022-02-22 20:20:18 +00:00
committed by Android (Google) Code Review
5 changed files with 8 additions and 4 deletions

View File

@@ -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);

View File

@@ -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);
}

View File

@@ -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.

View File

@@ -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);
}

View File

@@ -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();