commit 410b3a4c9937942bbf34803260111904fb25b5e3
author Cindy Lin <cindlin@google.com> Fri Mar 08 06:40:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 08 06:41:04 2024 +0000
tree f389b4026cfb995b85a44e6874d3453f56608078
parent 46f7cdda2d897908b02d479c341ade62c66c6155

Revert "Add wifi_twt_register_events() HAL api"

Revert submission 26139993-wifi_twt_register_events

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main-throttled-monitored&target=adt4-trunk_staging-userdebug&lkgb=11547652&lkbb=11547886&fkbb=11547886, bug: 328706639

BUG: 328706639

Reverted changes: /q/submissionid:26139993-wifi_twt_register_events

Change-Id: I575bf1cec62b30ac381d83addac03ec49ac70158

include/hardware_legacy/wifi_hal.h

diff --git a/include/hardware_legacy/wifi_hal.h b/include/hardware_legacy/wifi_hal.h
index a154649..9de61cc 100644
--- a/include/hardware_legacy/wifi_hal.h
+++ b/include/hardware_legacy/wifi_hal.h
@@ -1007,16 +1007,6 @@
      */
     wifi_error (*wifi_twt_get_capabilities)(wifi_interface_handle iface,
                                             wifi_twt_capabilities* capabilities);
-
-    /**
-     * Register TWT events before sending any TWT request
-     *
-     * @param wifi_interface_handle:
-     * @param events: TWT events callbacks to register
-     * @return Synchronous wifi_error
-     */
-    wifi_error (*wifi_twt_register_events)(wifi_interface_handle iface, wifi_twt_events events);
-
     /**
      * Setup a TWT session.
      *
@@ -1027,10 +1017,11 @@
      * @param id Identifier for the command. The value 0 is reserved.
      * @param iface Wifi interface handle
      * @param request TWT request parameters
+     * @param events TWT events
      * @return Synchronous wifi_error
     */
     wifi_error (*wifi_twt_session_setup)(wifi_request_id id, wifi_interface_handle iface,
-                                 wifi_twt_request request);
+                                 wifi_twt_request request, wifi_twt_events events);
     /**
      * Update a TWT session.
      *
@@ -1107,7 +1098,7 @@
      * @param TwtCallbackHandler: callback function pointers
      * @return Synchronous wifi_error
      *
-     * Note: This function is deprecated by wifi_twt_register_events
+     * Note: This function is deprecated
      */
     wifi_error (*wifi_twt_register_handler)(wifi_interface_handle iface,
                                             TwtCallbackHandler handler);