commit df7c4c6248c3c1bb6ec9309a677a33aa9cf1a1c0
author Keun-young Park <keunyoung@google.com> Wed Jun 05 21:43:34 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 05 21:43:34 2013 +0000
tree ed7c4e5568fa3be47dae5d81a4c3151e78e8ef8f
parent 27577b56a83dc616e7272618ce0f03ab96f11fc7
parent da8f60840d87a16a9ea0b36b8251a33084937438

Merge "cts: media: support no camera device in testSetMaxFileSize"

tests/tests/media/src/android/media/cts/MediaRecorderTest.java

diff --git a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
index 055b763..3cc71fa 100644
--- a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
@@ -412,7 +412,7 @@
     }
 
     public void testSetMaxFileSize() throws Exception {
-        if (!hasMicrophone()) {
+        if (!hasMicrophone() || !hasCamera()) {
             return;
         }
         testSetMaxFileSize(512 * 1024, 50 * 1024);