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

Commit 4b47ecaf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "wifi: Fix for DPP VTS test failures on 5GHz only devices" into... 

Merge "wifi: Fix for DPP VTS test failures on 5GHz only devices" into stage-aosp-rvc-ts-dev am: 80224805

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

Change-Id: I10cded9eaf3b390cd3897f302a9ca462b99d1ff7
parents b8adfe73 80224805

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

+6 −3
Original line number Diff line number Diff line
@@ -302,7 +302,8 @@ TEST_P(SupplicantStaIfaceHidlTest, AddDppPeerUriAndRomveUri) { 
    }



    hidl_string uri =

        "DPP:C:81/1;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"

        "DPP:C:81/1,117/"

        "40;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"

        "0DAQcDIgAD0edY4X3N//HhMFYsZfMbQJTiNFtNIWF/cIwMB/gzqOM=;;";

    uint32_t peer_id = 0;
@@ -347,7 +348,8 @@ TEST_P(SupplicantStaIfaceHidlTest, StartDppEnrolleeInitiator) { 
    }



    hidl_string uri =

        "DPP:C:81/1;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"

        "DPP:C:81/1,117/"

        "40;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"

        "0DAQcDIgAD0edY4X3N//HhMFYsZfMbQJTiNFtNIWF/cIwMB/gzqOM=;;";

    uint32_t peer_id = 0;
@@ -413,7 +415,8 @@ TEST_P(SupplicantStaIfaceHidlTest, StartDppConfiguratorInitiator) { 
    }



    hidl_string uri =

        "DPP:C:81/1;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"

        "DPP:C:81/1,117/"

        "40;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"

        "0DAQcDIgAD0edY4X3N//HhMFYsZfMbQJTiNFtNIWF/cIwMB/gzqOM=;;";

    uint32_t peer_id = 0;

wifi/supplicant/1.3/vts/functional/supplicant_sta_iface_hidl_test.cpp

+4 −2
Original line number Diff line number Diff line
@@ -419,7 +419,8 @@ TEST_P(SupplicantStaIfaceHidlTest, StartDppEnrolleeInitiator) { 
    }



    hidl_string uri =

        "DPP:C:81/1;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"

        "DPP:C:81/1,117/"

        "40;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"

        "0DAQcDIgAD0edY4X3N//HhMFYsZfMbQJTiNFtNIWF/cIwMB/gzqOM=;;";

    uint32_t peer_id = 0;
@@ -470,7 +471,8 @@ TEST_P(SupplicantStaIfaceHidlTest, StartDppConfiguratorInitiator) { 
    }



    hidl_string uri =

        "DPP:C:81/1;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"

        "DPP:C:81/1,117/"

        "40;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"

        "0DAQcDIgAD0edY4X3N//HhMFYsZfMbQJTiNFtNIWF/cIwMB/gzqOM=;;";

    uint32_t peer_id = 0;