From cb9792e9f773a40b9f11b79f85b8a495cefb0bef Mon Sep 17 00:00:00 2001 From: perkj Date: Mon, 30 Nov 2015 23:09:13 -0800 Subject: [PATCH] Fix VideoCapturerAndroidTest.testStartWhileCameraIsAlreadyOpen on Android M. Review URL: https://codereview.webrtc.org/1476313002 Cr-Commit-Position: refs/heads/master@{#10850} --- .../org/webrtc/VideoCapturerAndroidTestFixtures.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java index f90fd4fcc0..0331250a1c 100644 --- a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java +++ b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java @@ -416,6 +416,7 @@ public class VideoCapturerAndroidTestFixtures { static public void startWhileCameraIsAlreadyOpen( VideoCapturerAndroid capturer, Context appContext) throws InterruptedException { Camera camera = Camera.open(capturer.getCurrentCameraId()); + final List formats = capturer.getSupportedFormats(); final CameraEnumerationAndroid.CaptureFormat format = formats.get(0); @@ -423,7 +424,14 @@ public class VideoCapturerAndroidTestFixtures { capturer.startCapture(format.width, format.height, format.maxFramerate, appContext, observer); - assertFalse(observer.WaitForCapturerToStart()); + if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP_MR1) { + // The first opened camera client will be evicted. + assertTrue(observer.WaitForCapturerToStart()); + capturer.stopCapture(); + } else { + assertFalse(observer.WaitForCapturerToStart()); + } + capturer.dispose(); camera.release(); }