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

Commit c5e5f205 authored by Super Liu's avatar Super Liu
Browse files

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
parent ce8b56cd

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 byte[] bssid, in int errorCode);

  oneway void onEapFailure(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

+1 −2
Original line number Original line Diff line number Diff line
@@ -154,12 +154,11 @@ 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 byte[] bssid, in int errorCode);

    void onEapFailure(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

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

    ::ndk::ScopedAStatus onDppSuccessConfigSent() override {

        return ndk::ScopedAStatus::ok();

        return ndk::ScopedAStatus::ok();

    }

    }

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

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

                                      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 {