From 8230457989d63c3479604a08120dbf3692fbf94a Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Fri, 16 Dec 2022 22:17:39 +0000 Subject: [PATCH] audio: Fix streamCommon nullptr check in VTS Fix test code in AudioStream#GetStreamCommon test. Avoid crashing if the HAL module returns a null IStreamCommon instance pointer. Bug: 205884982 Test: atest VtsHalAudioCoreTargetTest Change-Id: I118ea1df49a127780a901479cf8cd5787be601f7 --- audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp b/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp index 1a97004a48..d21b1180dc 100644 --- a/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp @@ -1835,10 +1835,10 @@ class AudioStream : public AudioCoreModule { ASSERT_NO_FATAL_FAILURE(stream.SetUp(module.get(), kDefaultBufferSizeFrames)); std::shared_ptr streamCommon1; EXPECT_IS_OK(stream.get()->getStreamCommon(&streamCommon1)); - EXPECT_NE(nullptr, streamCommon1); std::shared_ptr streamCommon2; EXPECT_IS_OK(stream.get()->getStreamCommon(&streamCommon2)); - EXPECT_NE(nullptr, streamCommon2); + ASSERT_NE(nullptr, streamCommon1); + ASSERT_NE(nullptr, streamCommon2); EXPECT_EQ(streamCommon1->asBinder(), streamCommon2->asBinder()) << "getStreamCommon must return the same interface instance across invocations"; }