commit 9e6ab24989c044e09c8dee0930c08a615fcade40
author Mikhail Naganov <mnaganov@google.com> Sat Dec 17 02:03:20 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Dec 17 02:03:20 2022 +0000
tree 3cd0b57d0e3b3142a45d8a3d24520e40710b45cc
parent 32d6ff68546ecad0e51e974b4ae78179e4cbbcd0
parent 7c2b5ed7a1a0231f9840773e68de9dd1209ee8fa

Merge "audio: Fix streamCommon nullptr check in VTS" am: 7c2b5ed7a1

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

Change-Id: If837b42d2f31ed0919b2269039e2a6a8c60ac2d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp

diff --git a/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp b/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp
index 1a97004..d21b118 100644
--- a/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp
+++ b/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp
@@ -1835,10 +1835,10 @@
         ASSERT_NO_FATAL_FAILURE(stream.SetUp(module.get(), kDefaultBufferSizeFrames));
         std::shared_ptr<IStreamCommon> streamCommon1;
         EXPECT_IS_OK(stream.get()->getStreamCommon(&streamCommon1));
-        EXPECT_NE(nullptr, streamCommon1);
         std::shared_ptr<IStreamCommon> 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";
     }