Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 459bf8d5 authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

Merge changes from topic "eap-failure-bssid" into tm-mainline-prod 

* changes:
  [automerge] Add bssid to onEapFailure callback method. 2p: ce8b56cd
  Add bssid to onEapFailure callback method.
parents 8d31546b 5f9ac179

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ interface ISupplicantStaIfaceCallback { 
  oneway void onDppSuccess(in android.hardware.wifi.supplicant.DppEventType event);

  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 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 onDppSuccessConfigSent();

  oneway void onEapFailure(in int errorCode);

  oneway void onEapFailure(in byte[] bssid, in int errorCode);

  oneway void onExtRadioWorkStart(in int id);

  oneway void onExtRadioWorkStart(in int id);

  oneway void onExtRadioWorkTimeout(in int id);

  oneway void onExtRadioWorkTimeout(in int id);

  oneway void onHs20DeauthImminentNotice(in byte[] bssid, in int reasonCode, in int reAuthDelayInSec, in String url);

  oneway void onHs20DeauthImminentNotice(in byte[] bssid, in int reasonCode, in int reAuthDelayInSec, in String url);

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl

+2 −1
Original line number Original line Diff line number Diff line
@@ -154,11 +154,12 @@ oneway interface ISupplicantStaIfaceCallback { 




    /**

    /**

     * Indicates an EAP authentication failure.

     * Indicates an EAP authentication failure.

     * @param bssid BSSID of the access point.

     * @param errorCode Error code for EAP authentication failure.

     * @param errorCode Error code for EAP authentication failure.

     *        Either standard error code (enum EapErrorCode) or

     *        Either standard error code (enum EapErrorCode) or

     *        private error code defined by network provider.

     *        private error code defined by network provider.

     */

     */

    void onEapFailure(in int errorCode);

    void onEapFailure(in byte[] bssid, in int errorCode);





    /**

    /**

     * Used to indicate that the external radio work can start now.

     * Used to indicate that the external radio work can start now.

wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -130,7 +130,8 @@ class SupplicantStaIfaceCallback : public BnSupplicantStaIfaceCallback { 
    ::ndk::ScopedAStatus onDppSuccessConfigSent() override {

    ::ndk::ScopedAStatus onDppSuccessConfigSent() override {

        return ndk::ScopedAStatus::ok();

        return ndk::ScopedAStatus::ok();

    }

    }

    ::ndk::ScopedAStatus onEapFailure(int32_t /* errorCode */) override {

    ::ndk::ScopedAStatus onEapFailure(const std::vector<uint8_t>& /* bssid */,

                                      int32_t /* errorCode */) override {

        return ndk::ScopedAStatus::ok();

        return ndk::ScopedAStatus::ok();

    }

    }

    ::ndk::ScopedAStatus onExtRadioWorkStart(int32_t /* id */) override {

    ::ndk::ScopedAStatus onExtRadioWorkStart(int32_t /* id */) override {