Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65f6167f authored by Shivani Baranwal's avatar Shivani Baranwal Committed by Gabriel Biren
Browse files

wifi: Add qosPolicyRequestId in definition of supplicant AIDL APIs 

This CL is to add param qosPolicyRequestId in the supplicant AIDL
APIs needed for QoS policy feature. This param contains the
dialog token information of the Qos Policies.

Bug: 191426881
Test: atest VtsHalWifiSupplicantStaIfaceTargetTest
Change-Id: I31f9bf6006652ac8c75cbdfba231535bfd676ecd
parent dceca455

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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);

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -61,5 +61,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);

}

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIface.aidl

+3 −1
Original line number Diff line number Diff line
@@ -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.

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl

+2 −1
Original line number Diff line number Diff line
@@ -287,7 +287,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);

}

wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,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();