commit a4c411a954a9a1586fe214f2e38584e6d09d1cfc
author Eric Laurent <elaurent@google.com> Fri Jan 09 16:25:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 09 16:25:15 2015 +0000
tree acd8af6b1f7478067b804dad358273097345d3c2
parent 9ad1ab51d0429f30829058c342d08d892ad55fa0
parent c6471b2bd717e09ef859bd2e783996cfa580fe95

Merge "fix audio policy service binder security tests." into lmp-mr1-dev

tests/tests/security/jni/android_security_cts_AudioPolicyBinderTest.cpp

diff --git a/tests/tests/security/jni/android_security_cts_AudioPolicyBinderTest.cpp b/tests/tests/security/jni/android_security_cts_AudioPolicyBinderTest.cpp
index fac8f89..d9c7ce7 100644
--- a/tests/tests/security/jni/android_security_cts_AudioPolicyBinderTest.cpp
+++ b/tests/tests/security/jni/android_security_cts_AudioPolicyBinderTest.cpp
@@ -151,12 +151,11 @@
         return false;
     }
 
-    status_t status = aps->isStreamActive((audio_stream_type_t)(AUDIO_STREAM_MIN -1), 0);
-    if (status == NO_ERROR) {
+    if (aps->isStreamActive((audio_stream_type_t)(AUDIO_STREAM_MIN -1), 0)) {
         return false;
     }
-    status = aps->isStreamActive((audio_stream_type_t)AUDIO_STREAM_CNT, 0);
-    if (status == NO_ERROR) {
+
+    if (aps->isStreamActive((audio_stream_type_t)AUDIO_STREAM_CNT, 0)) {
         return false;
     }
     return true;
@@ -176,12 +175,11 @@
         return false;
     }
 
-    status_t status = aps->isStreamActiveRemotely((audio_stream_type_t)(AUDIO_STREAM_MIN -1), 0);
-    if (status == NO_ERROR) {
+    if (aps->isStreamActiveRemotely((audio_stream_type_t)(AUDIO_STREAM_MIN -1), 0)) {
         return false;
     }
-    status = aps->isStreamActiveRemotely((audio_stream_type_t)AUDIO_STREAM_CNT, 0);
-    if (status == NO_ERROR) {
+
+    if (aps->isStreamActiveRemotely((audio_stream_type_t)AUDIO_STREAM_CNT, 0)) {
         return false;
     }
     return true;