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

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

Merge "p2p: fix vts fail due to 5g go init fail with 00 country code" into qt-dev

parents 3e39fed7 72132c4f

wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ class SupplicantP2pIfaceHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
TEST_F(SupplicantP2pIfaceHidlTest, AddGroup_1_2_Success) {

TEST_F(SupplicantP2pIfaceHidlTest, AddGroup_1_2_Success) {

    std::vector<uint8_t> ssid(kTestSsid, kTestSsid + sizeof(kTestSsid));

    std::vector<uint8_t> ssid(kTestSsid, kTestSsid + sizeof(kTestSsid));

    std::string passphrase = kTestPassphrase;

    std::string passphrase = kTestPassphrase;

    int freq = 5;

    int freq = 0;

    std::array<uint8_t, 6> zero_mac_addr;

    std::array<uint8_t, 6> zero_mac_addr;

    memcpy(zero_mac_addr.data(), kTestZeroMacAddr, zero_mac_addr.size());

    memcpy(zero_mac_addr.data(), kTestZeroMacAddr, zero_mac_addr.size());

    bool persistent = false;

    bool persistent = false;
@@ -76,7 +76,7 @@ TEST_F(SupplicantP2pIfaceHidlTest, AddGroup_1_2_Success) { 
TEST_F(SupplicantP2pIfaceHidlTest, AddGroup_1_2_FailureInvalidSsid) {

TEST_F(SupplicantP2pIfaceHidlTest, AddGroup_1_2_FailureInvalidSsid) {

    std::vector<uint8_t> ssid;

    std::vector<uint8_t> ssid;

    std::string passphrase = kTestPassphrase;

    std::string passphrase = kTestPassphrase;

    int freq = 5;

    int freq = 0;

    std::array<uint8_t, 6> zero_mac_addr;

    std::array<uint8_t, 6> zero_mac_addr;

    memcpy(zero_mac_addr.data(), kTestZeroMacAddr, zero_mac_addr.size());

    memcpy(zero_mac_addr.data(), kTestZeroMacAddr, zero_mac_addr.size());

    bool persistent = false;

    bool persistent = false;
@@ -95,7 +95,7 @@ TEST_F(SupplicantP2pIfaceHidlTest, AddGroup_1_2_FailureInvalidSsid) { 
TEST_F(SupplicantP2pIfaceHidlTest, AddGroup_1_2_FailureInvalidPassphrase) {

TEST_F(SupplicantP2pIfaceHidlTest, AddGroup_1_2_FailureInvalidPassphrase) {

    std::vector<uint8_t> ssid(kTestSsid, kTestSsid + sizeof(kTestSsid));

    std::vector<uint8_t> ssid(kTestSsid, kTestSsid + sizeof(kTestSsid));

    std::string passphrase = "1234";

    std::string passphrase = "1234";

    int freq = 5;

    int freq = 0;

    std::array<uint8_t, 6> zero_mac_addr;

    std::array<uint8_t, 6> zero_mac_addr;

    memcpy(zero_mac_addr.data(), kTestZeroMacAddr, zero_mac_addr.size());

    memcpy(zero_mac_addr.data(), kTestZeroMacAddr, zero_mac_addr.size());

    bool persistent = false;

    bool persistent = false;