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

Commit 3a4cc775 authored by Gabriel Biren's avatar Gabriel Biren Committed by Automerger Merge Worker
Browse files

Merge "wifi: Add qosPolicyRequestId in definition of supplicant AIDL APIs"... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16980029

Change-Id: Ie6cfb7418a557aaa261408dd92531cc672fd6e7b
parents 83e75381 0453f81f

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ interface ISupplicantStaIface { 
  void reconnect();

  void reconnect();

  void registerCallback(in android.hardware.wifi.supplicant.ISupplicantStaIfaceCallback callback);

  void registerCallback(in android.hardware.wifi.supplicant.ISupplicantStaIfaceCallback callback);

  void setQosPolicyFeatureEnabled(in boolean enable);

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

  void removeDppUri(in int id);

  void removeDppUri(in int id);

  void removeExtRadioWork(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 Original line Diff line number Diff line
@@ -62,5 +62,5 @@ interface ISupplicantStaIfaceCallback { 
  oneway void onWpsEventPbcOverlap();

  oneway void onWpsEventPbcOverlap();

  oneway void onWpsEventSuccess();

  oneway void onWpsEventSuccess();

  oneway void onQosPolicyReset();

  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 Original line Diff line number Diff line
@@ -418,6 +418,7 @@ interface ISupplicantStaIface { 
     * sends a solicited (uses the ongoing DSCP request as dialog token) DSCP

     * sends a solicited (uses the ongoing DSCP request as dialog token) DSCP

     * response. Otherwise, sends an unsolicited DSCP response.

     * 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 morePolicies Flag to indicate more QoS policies can be accommodated.

     * @param qosPolicyStatusList QoS policy status info for each QoS policy id.

     * @param qosPolicyStatusList QoS policy status info for each QoS policy id.

     * @throws ServiceSpecificException with one of the following values:

     * @throws ServiceSpecificException with one of the following values:
@@ -425,7 +426,8 @@ interface ISupplicantStaIface { 
     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_UNSUPPORTED|

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

     * 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 Original line Diff line number Diff line
@@ -298,7 +298,8 @@ oneway interface ISupplicantStaIfaceCallback { 
    /**

    /**

     * Used to indicate a DSCP request was received from the AP.

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

     * @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 Original line Diff line number Diff line
@@ -201,6 +201,7 @@ class SupplicantStaIfaceCallback : public BnSupplicantStaIfaceCallback { 
    }

    }

    ::ndk::ScopedAStatus onQosPolicyReset() override { return ndk::ScopedAStatus::ok(); }

    ::ndk::ScopedAStatus onQosPolicyReset() override { return ndk::ScopedAStatus::ok(); }

    ::ndk::ScopedAStatus onQosPolicyRequest(

    ::ndk::ScopedAStatus onQosPolicyRequest(

            int32_t /* qosPolicyRequestId */,

            const std::vector<::aidl::android::hardware::wifi::supplicant ::

            const std::vector<::aidl::android::hardware::wifi::supplicant ::

                                      QosPolicyData /* qosPolicyData */>&) override {

                                      QosPolicyData /* qosPolicyData */>&) override {

        return ndk::ScopedAStatus::ok();

        return ndk::ScopedAStatus::ok();