commit 8d98f3bd9905efeca2962bb141849110130f85e1
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:40:56 2024 +0000
tree 96345132d5d01d8cdcf89c0d25c1b463c909d2a0
parent 6e37b45fd125dba48d1525058dd740abb94dfafb

Revert "Add an explicit TWT register events call"

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: I35ad8f55151ca0a93368c425ee85373120ce211e

wifi/aidl/default/wifi_legacy_hal.h

diff --git a/wifi/aidl/default/wifi_legacy_hal.h b/wifi/aidl/default/wifi_legacy_hal.h
index 3fd567b..121d1b5 100644
--- a/wifi/aidl/default/wifi_legacy_hal.h
+++ b/wifi/aidl/default/wifi_legacy_hal.h
@@ -780,16 +780,15 @@
 
     // TWT functions
     std::pair<wifi_twt_capabilities, wifi_error> twtGetCapabilities(const std::string& ifaceName);
-    wifi_error twtRegisterEvents(
-            const std::string& ifaceName, const on_twt_failure& on_twt_failure_user_callback,
-            const on_twt_session_create& on_twt_session_create_user_callback,
-            const on_twt_session_update& on_twt_session_update_user_callback,
-            const on_twt_session_teardown& on_twt_session_teardown_user_callback,
-            const on_twt_session_stats& on_twt_session_stats_user_callback,
-            const on_twt_session_suspend& on_twt_session_suspend_user_callback,
-            const on_twt_session_resume& on_twt_session_resume_user_callback);
     wifi_error twtSessionSetup(const std::string& ifaceName, uint32_t cmdId,
-                               const wifi_twt_request& request);
+                               const wifi_twt_request& request,
+                               const on_twt_failure& on_twt_failure_user_callback,
+                               const on_twt_session_create& on_twt_session_create_user_callback,
+                               const on_twt_session_update& on_twt_session_update_user_callback,
+                               const on_twt_session_teardown& on_twt_session_teardown_user_callback,
+                               const on_twt_session_stats& on_twt_session_stats_user_callback,
+                               const on_twt_session_suspend& on_twt_session_suspend_user_callback,
+                               const on_twt_session_resume& on_twt_session_resume_user_callback);
     wifi_error twtSessionUpdate(const std::string& ifaceName, uint32_t cmdId, uint32_t sessionId,
                                 const wifi_twt_request& request);
     wifi_error twtSessionSuspend(const std::string& ifaceName, uint32_t cmdId, uint32_t sessionId);
@@ -798,7 +797,7 @@
     wifi_error twtSessionGetStats(const std::string& ifaceName, uint32_t cmdId, uint32_t sessionId);
 
     // Note: Following TWT functions are deprecated
-    // Deprecated by twtRegisterEvegnts
+    // Deprecated
     wifi_error twtRegisterHandler(const std::string& iface_name,
                                   const TwtCallbackHandlers& handler);
     // Deprecated by twtGetCapabilities