Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "wifi: new state change HAL callback with current used key management mask"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-11-22 18:50:09 +00:00
committed by Android (Google) Code Review
parent 19ce3c81b1 d7ed5ae3f9
commit 1f5dec26ef
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl
View File

@@ -63,4 +63,5 @@ interface ISupplicantStaIfaceCallback {
oneway void onWpsEventSuccess();
oneway void onQosPolicyReset();
oneway void onQosPolicyRequest(in int qosPolicyRequestId, in android.hardware.wifi.supplicant.QosPolicyData[] qosPolicyData);
oneway void onStateChangedWithAkm(in android.hardware.wifi.supplicant.StaIfaceCallbackState newState, in byte[] bssid, in int id, in byte[] ssid, in boolean filsHlpSent, in android.hardware.wifi.supplicant.KeyMgmtMask keyMgmtMask);
}

26
wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl
View File

@@ -27,6 +27,7 @@ import android.hardware.wifi.supplicant.DppEventType;
import android.hardware.wifi.supplicant.DppFailureCode;
import android.hardware.wifi.supplicant.DppProgressCode;
import android.hardware.wifi.supplicant.Hs20AnqpData;
import android.hardware.wifi.supplicant.KeyMgmtMask;
import android.hardware.wifi.supplicant.OsuMethod;
import android.hardware.wifi.supplicant.QosPolicyData;
import android.hardware.wifi.supplicant.StaIfaceCallbackState;
@@ -252,6 +253,8 @@ oneway interface ISupplicantStaIfaceCallback {
* event is triggered by a particular network, the |SupplicantNetworkId|,
* |ssid|, |bssid| parameters must indicate the parameters of the network/AP
* which caused this state transition.
* <p>
* This callback is deprecated from AIDL v2, newer HAL should call onStateChangedWithAkm().
*
* @param newState New State of the interface. This must be one of the |State|
* values above.
@@ -303,4 +306,27 @@ oneway interface ISupplicantStaIfaceCallback {
* @param qosPolicyData QoS policies info requested by the AP.
*/
void onQosPolicyRequest(in int qosPolicyRequestId, in QosPolicyData[] qosPolicyData);
/**
* Used to indicate a state change event on this particular iface. If this
* event is triggered by a particular network, the |id|,
* |ssid|, |bssid| parameters must indicate the parameters of the network/AP
* which caused this state transition.
*
* @param newState New State of the interface. This must be one of the
* |StaIfaceCallbackState| values above.
* @param bssid BSSID of the corresponding AP which caused this state
* change event. This must be zero'ed if this event is not
* specific to a particular network.
* @param id ID of the corresponding network which caused this
* state change event. This must be invalid (-1) if this
* event is not specific to a particular network.
* @param ssid SSID of the corresponding network which caused this state
* change event. This must be empty if this event is not specific
* to a particular network.
* @param filsHlpSent Whether FILS HLP IEs were included in this association.
* @param keyMgmtMask current used key mgmt mask.
*/
void onStateChangedWithAkm(in StaIfaceCallbackState newState, in byte[] bssid, in int id,
in byte[] ssid, in boolean filsHlpSent, in KeyMgmtMask keyMgmtMask);
}

7
wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp
View File

@@ -206,6 +206,13 @@ class SupplicantStaIfaceCallback : public BnSupplicantStaIfaceCallback {
QosPolicyData /* qosPolicyData */>&) override {
return ndk::ScopedAStatus::ok();
}
::ndk::ScopedAStatus onStateChangedWithAkm(
::aidl::android::hardware::wifi::supplicant::StaIfaceCallbackState /* newState */,
const std::vector<uint8_t>& /* bssid */, int32_t /* id */,
const std::vector<uint8_t>& /* ssid */, bool /* filsHlpSent */,
::aidl::android::hardware::wifi::supplicant::KeyMgmtMask /* keyMgmtMask*/) override {
return ndk::ScopedAStatus::ok();
}
};
class SupplicantStaIfaceAidlTest : public testing::TestWithParam<std::string> {