commit f394d10bec9d7acdca6e28905cb6554b720f9383
author Daniel Xie <dxie@google.com> Mon Jul 20 22:16:04 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 20 22:16:05 2015 +0000
tree 786ca6c5e9f2cc0b95ec24584b445730ed744ea6
parent c59abe4b38aa4d3dfe7f45ffefd0470d8825c009
parent 36d5b83137d7bee56f4fd873fc926df58c1c9e8a

Merge "Revert "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 4597da7..9daa2cb 100644
--- a/tests/tests/security/jni/android_security_cts_AudioPolicyBinderTest.cpp
+++ b/tests/tests/security/jni/android_security_cts_AudioPolicyBinderTest.cpp
@@ -142,11 +142,12 @@
         return false;
     }
 
-    if (aps->isStreamActive((audio_stream_type_t)(AUDIO_STREAM_MIN -1), 0)) {
+    status_t status = aps->isStreamActive((audio_stream_type_t)(-1), 0);
+    if (status == NO_ERROR) {
         return false;
     }
-
-    if (aps->isStreamActive((audio_stream_type_t)AUDIO_STREAM_CNT, 0)) {
+    status = aps->isStreamActive((audio_stream_type_t)AUDIO_STREAM_CNT, 0);
+    if (status == NO_ERROR) {
         return false;
     }
     return true;