Revert "Add bssid to onEapFailure callback method."
Revert "[automerge] Add bssid to onEapFailure callback method. 2..."
Revert "Update framework callback implementation to accept the b..."
Revert "[automerge] Update framework callback implementation to ..."
Revert "[automerge] Update framework callback implementation to ..."
Revert submission 16982405-eap-failure-bssid
Reason for revert: Broken build on git_master
Reverted Changes:
I2d2a27255:Add bssid to onEapFailure callback method.
I5eb812575:[automerge] Update framework callback implementati...
I64474d678:[automerge] Update framework callback implementati...
If08fc19f0:Update framework callback implementation to accept...
I71a514dde:[automerge] Add bssid to onEapFailure callback met...
I1490b9dcc:[automerge] Add bssid to onEapFailure callback met...
I699052131:Update supplicant service to call onEapFailure wit...
Change-Id: I7c926e2d446399ee79ea62f50735647411a35576
diff --git a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl
index 25a09b4..46c8000 100644
--- a/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl
+++ b/wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl
@@ -46,7 +46,7 @@
oneway void onDppSuccess(in android.hardware.wifi.supplicant.DppEventType event);
oneway void onDppSuccessConfigReceived(in byte[] ssid, in String password, in byte[] psk, in android.hardware.wifi.supplicant.DppAkm securityAkm, in android.hardware.wifi.supplicant.DppConnectionKeys dppConnectionKeys);
oneway void onDppSuccessConfigSent();
- oneway void onEapFailure(in byte[] bssid, in int errorCode);
+ oneway void onEapFailure(in int errorCode);
oneway void onExtRadioWorkStart(in int id);
oneway void onExtRadioWorkTimeout(in int id);
oneway void onHs20DeauthImminentNotice(in byte[] bssid, in int reasonCode, in int reAuthDelayInSec, in String url);
diff --git a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl
index 0730a8c..895bc50 100644
--- a/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl
+++ b/wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl
@@ -154,12 +154,11 @@
/**
* Indicates an EAP authentication failure.
- * @param bssid BSSID of the access point.
* @param errorCode Error code for EAP authentication failure.
* Either standard error code (enum EapErrorCode) or
* private error code defined by network provider.
*/
- void onEapFailure(in byte[] bssid, in int errorCode);
+ void onEapFailure(in int errorCode);
/**
* Used to indicate that the external radio work can start now.
diff --git a/wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp b/wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp
index 2ed6a0e..1c00ec7 100644
--- a/wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp
+++ b/wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp
@@ -130,8 +130,7 @@
::ndk::ScopedAStatus onDppSuccessConfigSent() override {
return ndk::ScopedAStatus::ok();
}
- ::ndk::ScopedAStatus onEapFailure(const std::vector<uint8_t>& /* bssid */,
- int32_t /* errorCode */) override {
+ ::ndk::ScopedAStatus onEapFailure(int32_t /* errorCode */) override {
return ndk::ScopedAStatus::ok();
}
::ndk::ScopedAStatus onExtRadioWorkStart(int32_t /* id */) override {