commit 739fbefe2df8a9dead4cb08f57b484861e41814d
author Chih-Hung Hsieh <chh@google.com> Sat Sep 24 18:07:38 2022 -0700
committer Chih-Hung Hsieh <chh@google.com> Sat Sep 24 18:07:38 2022 -0700
tree fa7b4335f0675829b6f89ce4b5765c146a45ecfc
parent 54f0b5287e73ea043e4ddc2871533f77a932baee

Fix out-of-memory error.

Bug: 248637663
Test: atest android.hardware.audio.common@7.0-util_tests android.hardware.audio.common@7.1-util_tests
Change-Id: Ifb41ddc3fbfa8c9db7f3e10cede2155d28d3c8c4

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

diff --git a/audio/common/all-versions/default/tests/hidlutils_tests.cpp b/audio/common/all-versions/default/tests/hidlutils_tests.cpp
index e5ed844..83bb8a9 100644
--- a/audio/common/all-versions/default/tests/hidlutils_tests.cpp
+++ b/audio/common/all-versions/default/tests/hidlutils_tests.cpp
@@ -1105,8 +1105,12 @@
     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);