summaryrefslogtreecommitdiffstats
path: root/media/tests
diff options
context:
space:
mode:
Diffstat (limited to 'media/tests')
-rwxr-xr-xmedia/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java2
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
index 6087268..0e883e6 100755
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
@@ -48,7 +48,7 @@ public class MediaNames {
public static final long PAUSE_WAIT_TIME = 3000;
public static final long WAIT_TIME = 2000;
- public static final long WAIT_LONG = 4000;
+ public static final long WAIT_SNAPSHOT_TIME = 5000;
//Streaming Video
public static final String VIDEO_HTTP3GP = "http://pvs.pv.com/jj/lipsync0.3gp";
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
index fa0986a..784db97 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
@@ -192,7 +192,7 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe
}
mCamera.setPreviewCallback(null);
mCamera.takePicture(mShutterCallback, mRawPictureCallback, mJpegPictureCallback);
- Thread.sleep(MediaNames.WAIT_LONG);
+ Thread.sleep(MediaNames.WAIT_SNAPSHOT_TIME);
} catch (Exception e) {
Log.v(TAG, e.toString());
}