commit 55a5b8b482a26030dfe0a5dc3173b982c1615f34
author Kevin Rocard <krocard@google.com> Wed Nov 21 16:09:02 2018 -0800
committer Kevin Rocard <krocard@google.com> Wed Nov 28 20:29:52 2018 -0800
tree cb9fc1ba108f61c6fa467a5cadafee9a7d6c591b
parent a497499c4ac958b15ebd3f13382888e0258f09e8

Audio VTS: Simplify sequential #if

Test: compile
Change-Id: Ie30b0df64d122a8cac0a5fc8b2ebc5255fccbc24
Signed-off-by: Kevin Rocard <krocard@google.com>

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 79ccc3c..fd061da 100644
--- a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
+++ b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
@@ -205,14 +205,13 @@
         sp<IDevice> baseDevice;
         ASSERT_OK(devicesFactory->openDevice(IDevicesFactory::Device::PRIMARY,
                                              returnIn(result, baseDevice)));
-#elif MAJOR_VERSION == 4
-        ASSERT_OK(devicesFactory->openPrimaryDevice(returnIn(result, device)));
-#endif
         ASSERT_OK(result);
-#if MAJOR_VERSION == 2
         ASSERT_TRUE(baseDevice != nullptr);
 
         device = IPrimaryDevice::castFrom(baseDevice);
+#elif MAJOR_VERSION >= 4
+        ASSERT_OK(devicesFactory->openPrimaryDevice(returnIn(result, device)));
+        ASSERT_OK(result);
 #endif
     }
 };