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

This commit is contained in:
TreeHugger Robot
2022-01-25 00:58:24 +00:00
committed by Android (Google) Code Review
3 changed files with 22 additions and 0 deletions

View File

@@ -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;

View File

@@ -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);
}

View File

@@ -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(