commit b3e86d489a5f5d1520837f377257adfa33290894
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 28 18:48:10 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 28 18:48:10 2018 +0000
tree 4ae397e91b8c5dfe8cff11a6448687395255110a
parent 2910e64d2466a502390f3c7fa9aa2fd57b94eaec
parent 8073d8e41c175ccd15129a280275fd8ac6efc635

Merge "Audio VTS was testing wrong uninitialized variable due to typo" into pie-vts-dev

audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp

diff --git a/audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp b/audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp
index c764ea6..761330f 100644
--- a/audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp
+++ b/audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp
@@ -555,11 +555,11 @@
             address.device = deviceType;
             auto ret = device->setConnectedState(address, state);
             ASSERT_TRUE(ret.isOk());
-            if (res == Result::NOT_SUPPORTED) {
+            if (ret == Result::NOT_SUPPORTED) {
                 doc::partialTest("setConnectedState is not supported");
                 return;
             }
-            ASSERT_OK(res);
+            ASSERT_OK(ret);
         }
     }
 }