[automerger skipped] Merge "aidl drm: independent min/max SecurityLevel for each supported mime" into tm-dev am: 69367a9a53 -s ours
am skip reason: Merged-In I9dcd786fe921c6ed4ac49bba5a6dddf887404df3 with SHA-1 1203027999 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16957514
Change-Id: I37380b789c4e42b42f3b3a285472781acee405ee
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 {