From 2b8b126ca0a02624f5b7ef7ba974960f90319a9e Mon Sep 17 00:00:00 2001 From: "divya.n1" Date: Mon, 11 Sep 2023 18:09:53 +0530 Subject: [PATCH 1/2] Add enum for aggressive roaming mode to the Vendor HAL AIDL interface. Bug: 269196966 Test: m Change-Id: Icc972fdea98035ad7668b85a7f4c3ae0c38f732d --- .../current/android/hardware/wifi/StaRoamingState.aidl | 1 + wifi/aidl/android/hardware/wifi/StaRoamingState.aidl | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaRoamingState.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaRoamingState.aidl index 1f3d91f290..fd7d567105 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaRoamingState.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaRoamingState.aidl @@ -36,4 +36,5 @@ package android.hardware.wifi; enum StaRoamingState { DISABLED = 0, ENABLED = 1, + AGGRESSIVE = 2, } diff --git a/wifi/aidl/android/hardware/wifi/StaRoamingState.aidl b/wifi/aidl/android/hardware/wifi/StaRoamingState.aidl index d75d3236f1..6872a17608 100644 --- a/wifi/aidl/android/hardware/wifi/StaRoamingState.aidl +++ b/wifi/aidl/android/hardware/wifi/StaRoamingState.aidl @@ -32,4 +32,9 @@ enum StaRoamingState { * the |StaRoamingConfig| parameters set using |configureRoaming|. */ ENABLED = 1, + /** + * Driver/Firmware is allowed to roam more aggressively. For instance, + * roaming can be triggered at higher RSSI thresholds than normal. + */ + AGGRESSIVE = 2, } From 67d33e9710696570becf091b4f30c0f3f27df5e4 Mon Sep 17 00:00:00 2001 From: Gabriel Biren Date: Fri, 1 Dec 2023 01:29:26 +0000 Subject: [PATCH 2/2] Add aggressive roaming support to the Vendor HAL implementation. Bug: 269196966 Test: Vendor HAL Gtest suite Test: atest VtsHalWifiStaIfaceTargetTest Change-Id: I63d9f9a6994fbf76c16c82834f70c7a1e4966ad4 --- wifi/aidl/default/aidl_struct_util.cpp | 2 ++ wifi/aidl/default/wifi_legacy_hal.h | 1 + 2 files changed, 3 insertions(+) diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp index 83e11939fd..a67f59ed41 100644 --- a/wifi/aidl/default/aidl_struct_util.cpp +++ b/wifi/aidl/default/aidl_struct_util.cpp @@ -1147,6 +1147,8 @@ legacy_hal::fw_roaming_state_t convertAidlRoamingStateToLegacy(StaRoamingState s return legacy_hal::ROAMING_ENABLE; case StaRoamingState::DISABLED: return legacy_hal::ROAMING_DISABLE; + case StaRoamingState::AGGRESSIVE: + return legacy_hal::ROAMING_AGGRESSIVE; }; CHECK(false); } diff --git a/wifi/aidl/default/wifi_legacy_hal.h b/wifi/aidl/default/wifi_legacy_hal.h index 5168a8bccf..6f012ec857 100644 --- a/wifi/aidl/default/wifi_legacy_hal.h +++ b/wifi/aidl/default/wifi_legacy_hal.h @@ -186,6 +186,7 @@ using ::NanTransmitFollowupRequest; using ::NanTxType; using ::NpkSecurityAssociation; using ::PASN; +using ::ROAMING_AGGRESSIVE; using ::ROAMING_DISABLE; using ::ROAMING_ENABLE; using ::RTT_PEER_AP;