From 8ebd52bf4166a5ef8b7e91c9e3ecce2ce27cff12 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Tue, 13 Aug 2013 12:09:44 -0700 Subject: Camera2: Add CameraDevice#flush() - For quickly clearing out all pending and in-progress captures Bug: 9758581 Change-Id: Ie4123fcc4d4b648a11d4a6257c531f07182bab39 --- .../integration/CameraDeviceBinderTest.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'media/tests/MediaFrameworkTest') diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java index 722087c..2f271bb 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java @@ -309,4 +309,34 @@ public class CameraDeviceBinderTest extends AndroidTestCase { argThat(matcher)); request.close(); } + + @SmallTest + public void testFlush() throws Exception { + int status; + + // Initial flush should work + status = mCameraUser.flush(); + assertEquals(CameraBinderTestUtils.NO_ERROR, status); + + // Then set up a stream + CaptureRequest request = createDefaultRequest(/* needStream */true); + + // Flush should still be a no-op, really + status = mCameraUser.flush(); + assertEquals(CameraBinderTestUtils.NO_ERROR, status); + + // Submit a few capture requests + int requestId1 = submitCameraRequest(request, /* streaming */false); + int requestId2 = submitCameraRequest(request, /* streaming */false); + int requestId3 = submitCameraRequest(request, /* streaming */false); + int requestId4 = submitCameraRequest(request, /* streaming */false); + int requestId5 = submitCameraRequest(request, /* streaming */false); + + // Then flush + status = mCameraUser.flush(); + assertEquals(CameraBinderTestUtils.NO_ERROR, status); + + // TODO: When errors are hooked up, count that errors + successful + // requests equal to 5. + } } -- cgit v1.1