commit 875e721880885aac62a8cac0a4013045930348c6
author Xin Li <delphij@google.com> Thu Aug 12 17:49:09 2021 -0700
committer Xin Li <delphij@google.com> Fri Aug 13 00:54:30 2021 +0000
tree dbbf238220f189f1d599b97f3815a80dc8e1f2d0
parent 97f444764538e3e981d9a001525c7f3488183ebc
parent bb90e848b95d9664b05803e797f56709d04fb169

Merge stage-aosp-sc-ts-dev before making it an upstream

Bug: 169893837
Merged-In: I6970e4114a1efacc36e25871b77c5350496a0b2a
Change-Id: I996a73bdcf0574bb961115d80f0065a489fb2a6f

audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h

diff --git a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
index aa7fd8e..340903a 100644
--- a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
+++ b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
@@ -1390,6 +1390,9 @@
                 config.channelMask.value(channelMask);
                 auto ret = stream->setAudioProperties(config);
                 EXPECT_TRUE(ret.isOk());
+                if (ret == Result::NOT_SUPPORTED) {
+                    GTEST_SKIP() << "setAudioProperties is not supported";
+                }
                 EXPECT_EQ(Result::OK, ret)
                         << profile.format << "; " << sampleRate << "; " << channelMask;
             }