| commit | 3996d69a0e8d9214b21681b286dd93fdd38b82ee | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Aug 13 19:12:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 19:12:48 2021 +0000 |
| tree | 2c318d0791cb804e4695aa79f0988f85272b27b6 | |
| parent | ef49c282d8b9badc43b5fe318ceb4c6656b1a25d [diff] | |
| parent | 92f239854237e67bf915247784aaf7f83ab6c81e [diff] |
Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 92f2398542 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15547734 Change-Id: Ie4ec5c89380260df60b2cfcce84edf112e65a774
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; }