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

Commit b51f4c57 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add HAL API to support conservative mode for EAP-SIM/AKA/AKA'"

parents d888dfee 9ff9db46

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

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ interface ISupplicantStaNetwork { 
  void setWepTxKeyIdx(in int keyIdx);

  void setRoamingConsortiumSelection(in byte[] selectedRcoi);

  void setMinimumTlsVersionEapPhase1Param(android.hardware.wifi.supplicant.TlsVersion tlsVersion);

  void setStrictConservativePeerMode(in boolean enable);

  const int SSID_MAX_LEN_IN_BYTES = 32;

  const int PSK_PASSPHRASE_MIN_LEN_IN_BYTES = 8;

  const int PSK_PASSPHRASE_MAX_LEN_IN_BYTES = 63;

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaNetwork.aidl

+10 −0
Original line number Diff line number Diff line
@@ -1131,4 +1131,14 @@ interface ISupplicantStaNetwork { 
     *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|

     */

    void setMinimumTlsVersionEapPhase1Param(TlsVersion tlsVersion);



    /**

     * Enable the strict conservative peer mode for EAP-SIM/AKA/AKA'

     *

     * @param enable true to enable, false to disable.

     * @throws ServiceSpecificException with one of the following values:

     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|

     */

    void setStrictConservativePeerMode(in boolean enable);

}

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

+8 −0
Original line number Diff line number Diff line
@@ -649,6 +649,14 @@ TEST_P(SupplicantStaNetworkAidlTest, SetEapEncryptedImsiIdentity) { 
            .isOk());

}



/*

 * SetStrictConservativePeerMode

 */

TEST_P(SupplicantStaNetworkAidlTest, SetStrictConversativePeerMode) {

    EXPECT_TRUE(sta_network_->setStrictConservativePeerMode(true).isOk());

    EXPECT_TRUE(sta_network_->setStrictConservativePeerMode(false).isOk());

}



/*

 * SendNetworkEapIdentityResponse

 */