commit 6716898477122009be579f9d509b16e7b506358b
author Daniel Xie <dxie@google.com> Mon Jul 20 21:10:25 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 20 21:10:25 2015 +0000
tree 959a8f38e86b2d616dc5354be46c9d60af2d1e52
parent 4a53e9342632c0683c8e2d1a22cb25d432a39d1d
parent 49a910d3b4e27b3eaf8918206b507a2fcc3bc1cc

Merge "fix audio policy service binder security tests." into kitkat-cts-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 9daa2cb..4597da7 100644
--- a/tests/tests/security/jni/android_security_cts_AudioPolicyBinderTest.cpp
+++ b/tests/tests/security/jni/android_security_cts_AudioPolicyBinderTest.cpp
@@ -142,12 +142,11 @@
         return false;
     }
 
-    status_t status = aps->isStreamActive((audio_stream_type_t)(-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;