Merge "Fix SetCountryCode test when US is not supported" am: 2585f44a6e am: 931a68b2e5 am: b6deacd959

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662343

Change-Id: Ic21d2b3131ad4e5b610835de4efa29a6e5baf00b
This commit is contained in:
Jonathan Reichert
2021-04-22 13:42:15 +00:00
committed by Automerger Merge Worker

View File

@@ -26,6 +26,7 @@
#include "supplicant_hidl_call_util.h"
#include "supplicant_hidl_test_utils.h"
#include <cutils/properties.h>
using ::android::sp;
using ::android::hardware::hidl_array;
@@ -62,7 +63,7 @@ constexpr char kTestRadioWorkName[] = "TestRadioWork";
constexpr uint32_t kTestRadioWorkFrequency = 2412;
constexpr uint32_t kTestRadioWorkTimeout = 8;
constexpr uint32_t kTestRadioWorkId = 16;
constexpr int8_t kTestCountryCode[] = {'U', 'S'};
int8_t kTestCountryCode[] = {'U', 'S'};
constexpr uint8_t kTestWpsDeviceType[] = {[0 ... 7] = 0x01};
constexpr uint16_t kTestWpsConfigMethods = 0xffff;
} // namespace
@@ -444,6 +445,10 @@ TEST_P(SupplicantStaIfaceHidlTest, SetSuspendModeEnabled) {
* SetCountryCode.
*/
TEST_P(SupplicantStaIfaceHidlTest, SetCountryCode) {
std::array<char, PROPERTY_VALUE_MAX> buffer;
property_get("ro.boot.wificountrycode", buffer.data(), "US");
kTestCountryCode[0] = buffer.data()[0];
kTestCountryCode[1] = buffer.data()[1];
sta_iface_->setCountryCode(
kTestCountryCode, [](const SupplicantStatus& status) {
EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);