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

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

Merge "wifi: add API for setting roaming consortium selection"

parents 47a1952f a2b862a5

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
@@ -125,6 +125,7 @@ interface ISupplicantStaNetwork { 
  void setWapiCertSuite(in String suite);

  void setWepKey(in int keyIdx, in byte[] wepKey);

  void setWepTxKeyIdx(in int keyIdx);

  void setRoamingConsortiumSelection(in byte[] selectedRcoi);

  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

+13 −0
Original line number Diff line number Diff line
@@ -1092,4 +1092,17 @@ interface ISupplicantStaNetwork { 
     *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|

     */

    void setWepTxKeyIdx(in int keyIdx);



    /**

     * Set the roaming consortium selection.

     *

     * @param selectedRcoi Indicates the roaming consortium selection. This is a

     *            3 or 5-octet long byte array that indicates the selected RCOI

     *            used for a Passpoint connection.

     * @throws ServiceSpecificException with one of the following values:

     *         |SupplicantStatusCode.FAILURE_ARGS_INVALID|,

     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|

     */

    void setRoamingConsortiumSelection(in byte[] selectedRcoi);

}

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

+8 −0
Original line number Diff line number Diff line
@@ -784,6 +784,14 @@ TEST_P(SupplicantStaNetworkAidlTest, GetWpsNfcConfigurationToken) { 
    EXPECT_NE(retrievedToken.size(), 0);

}



/*

 * SetRoamingConsortiumSelection

 */

TEST_P(SupplicantStaNetworkAidlTest, SetRoamingConsortiumSelection) {

    const std::vector<uint8_t> testSelection = std::vector<uint8_t>({0x11, 0x21, 0x33, 0x44});

    EXPECT_TRUE(sta_network_->setRoamingConsortiumSelection(testSelection).isOk());

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaNetworkAidlTest);

INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantStaNetworkAidlTest,

                         testing::ValuesIn(android::getAidlHalInstanceNames(