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

Commit d0674bab authored by Gabriel Biren's avatar Gabriel Biren
Browse files

Change the return type to null for the 

synchronous USD publish/subscribe methods.

USD may be offloaded to a component
outside of supplicant, so we may not
be able to guarantee that the ID will
be available immediately.

Since the ID is also returned in the
callback, we can retrieve it from
there instead.

Bug: 340878198
Test: m
Change-Id: I69fc954ba028f33f74b226d1c4597700551ec21f
parent 640bd198

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

+2 −2
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ interface ISupplicantStaIface { 
  void configureMscs(in android.hardware.wifi.supplicant.MscsParams params);

  void disableMscs();

  android.hardware.wifi.supplicant.UsdCapabilities getUsdCapabilities();

  int startUsdPublish(in int cmdId, in android.hardware.wifi.supplicant.UsdPublishConfig usdPublishConfig);

  int startUsdSubscribe(in int cmdId, in android.hardware.wifi.supplicant.UsdSubscribeConfig usdSubscribeConfig);

  void startUsdPublish(in int cmdId, in android.hardware.wifi.supplicant.UsdPublishConfig usdPublishConfig);

  void startUsdSubscribe(in int cmdId, in android.hardware.wifi.supplicant.UsdSubscribeConfig usdSubscribeConfig);

  void updateUsdPublish(in int publishId, in byte[] serviceSpecificInfo);

  void cancelUsdPublish(in int publishId);

  void cancelUsdSubscribe(in int subscribeId);

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

+2 −6
Original line number Diff line number Diff line
@@ -897,13 +897,11 @@ interface ISupplicantStaIface { 
     * @param cmdId Identifier for this request. Will be returned in the callback to identify

     *              the request.

     * @param usdPublishConfig Parameters for the requested publish session.

     * @return Publish ID identifying the publish session. This ID will also be returned in the

               onStarted callback when the session setup is completed successfully.

     * @throws ServiceSpecificException with one of the following values:

     *         |SupplicantStatusCode.FAILURE_UNKNOWN|

     *         |SupplicantStatusCode.FAILURE_UNSUPPORTED|

     */

    int startUsdPublish(in int cmdId, in UsdPublishConfig usdPublishConfig);

    void startUsdPublish(in int cmdId, in UsdPublishConfig usdPublishConfig);



    /**

     * Start a USD subscribe session. Triggers a response via
@@ -913,13 +911,11 @@ interface ISupplicantStaIface { 
     * @param cmdId Identifier for this request. Will be returned in the callback to identify

     *              the request.

     * @param usdSubscribeConfig Parameters for the requested subscribe session.

     * @return Subscribe ID identifying the subscribe session. This ID will also be returned in the

               onStarted callback when the session setup is completed successfully.

     * @throws ServiceSpecificException with one of the following values:

     *         |SupplicantStatusCode.FAILURE_UNKNOWN|

     *         |SupplicantStatusCode.FAILURE_UNSUPPORTED|

     */

    int startUsdSubscribe(in int cmdId, in UsdSubscribeConfig usdSubscribeConfig);

    void startUsdSubscribe(in int cmdId, in UsdSubscribeConfig usdSubscribeConfig);



    /**

     * Update the service-specific info for an active publish session.