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

Commit fa6d6746 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Automerger Merge Worker
Browse files

Merge "Fix out-of-memory error." am: f4a9ee68 am: 3086bb11 

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



Change-Id: I82c6d06ba75e6f1e6c68fb0a4f8751c628a68cc6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 082b2ac6 3086bb11

audio/common/all-versions/default/tests/hidlutils_tests.cpp

+6 −2
Original line number Diff line number Diff line
@@ -1129,8 +1129,12 @@ TYPED_TEST(FilterTest, FilterOutNonVendorTags) { 
    TypeParam emptyTags;

    EXPECT_EQ(emptyTags, HidlUtils::filterOutNonVendorTags(emptyTags));



    TypeParam allVendorTags = {{"VX_GOOGLE_VR_42", "VX_GOOGLE_1E100"}};

    EXPECT_EQ(allVendorTags, HidlUtils::filterOutNonVendorTags(allVendorTags));

    // b/248421569, allocate two vendor tags at a time can run out of memory

    // TypeParam allVendorTags = {{"VX_GOOGLE_VR_42", "VX_GOOGLE_1E100"}};

    TypeParam allVendorTags1 = {{"VX_GOOGLE_VR_42"}};

    EXPECT_EQ(allVendorTags1, HidlUtils::filterOutNonVendorTags(allVendorTags1));

    TypeParam allVendorTags2 = {{"VX_GOOGLE_1E100"}};

    EXPECT_EQ(allVendorTags2, HidlUtils::filterOutNonVendorTags(allVendorTags2));



    TypeParam oneVendorTag = {{"", "VX_GOOGLE_VR", "random_string"}};

    TypeParam oneVendorTagOnly = HidlUtils::filterOutNonVendorTags(oneVendorTag);