Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73cf2a11 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by The Android Open Source Project
Browse files

Merge branch 'readonly-p4-master'

parents e7e37036 e398e3bf

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java

+2 −2
Original line number Diff line number Diff line
@@ -228,8 +228,8 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe 
     */

    @LargeTest

    public void testTakePicture() throws Exception {  

        initializeMessageLooper();

        synchronized (lock) {

            initializeMessageLooper();

            try {

                lock.wait(WAIT_FOR_COMMAND_TO_COMPLETE);

            } catch(Exception e) {
@@ -250,8 +250,8 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe 
     */

    @LargeTest

    public void testCheckPreview() throws Exception {  

        initializeMessageLooper();

        synchronized (lock) {

            initializeMessageLooper();

            try {

                lock.wait(WAIT_FOR_COMMAND_TO_COMPLETE);

            } catch(Exception e) {