commit c59abe4b38aa4d3dfe7f45ffefd0470d8825c009
author Daniel Xie <dxie@google.com> Mon Jul 20 21:50:52 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 20 21:50:52 2015 +0000
tree 9b876c818a11d7d0c17a64ea535e408da2b326f6
parent 6716898477122009be579f9d509b16e7b506358b
parent 17e4046ab317d8583e3bc58cafc8df3924a430a0

Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev

tests/res/layout/view_layout.xml

diff --git a/tests/res/layout/view_layout.xml b/tests/res/layout/view_layout.xml
index 40974f0..7746420 100644
--- a/tests/res/layout/view_layout.xml
+++ b/tests/res/layout/view_layout.xml
@@ -25,8 +25,8 @@
 
     <android.view.cts.MockView
         android:id="@+id/mock_view"
-        android:layout_width="100px"
-        android:layout_height="200px"/>
+        android:layout_width="100dp"
+        android:layout_height="200dp"/>
 
     <android.view.cts.MockView
         android:id="@+id/scroll_view"

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;