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

Commit 428ec926 authored by Igor Murashkin's avatar Igor Murashkin Committed by Android (Google) Code Review
Browse files

Merge "camera2: Fix out-of-date metadata test"

parents c90005d2 5c207ec9

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,9 @@ public class CameraDeviceBinderTest extends AndroidTestCase { 




    private int submitCameraRequest(CaptureRequest request, boolean streaming) throws Exception {

    private int submitCameraRequest(CaptureRequest request, boolean streaming) throws Exception {

        int requestId = mCameraUser.submitRequest(request, streaming);

        int requestId = mCameraUser.submitRequest(request, streaming);

        assertTrue("Request IDs should be non-negative", requestId >= 0);

        assertTrue(

                "Request IDs should be non-negative (expected: >= 0, actual: " + requestId + ")",

                requestId >= 0);

        return requestId;

        return requestId;

    }

    }

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -309,7 +309,7 @@ public class CameraMetadataTest extends junit.framework.TestCase { 
                });

                });





        // rational (n) -- in particular rational x 9

        // rational (n) -- in particular rational x 9

        checkKeyGetAndSetArray("android.sensor.calibrationTransform1", Rational[].class,

        checkKeyGetAndSetArray("android.sensor.calibrationTransform", Rational[].class,

                new Rational[] {

                new Rational[] {

                        new Rational(1, 2), new Rational(3, 4), new Rational(5, 6),

                        new Rational(1, 2), new Rational(3, 4), new Rational(5, 6),

                        new Rational(7, 8), new Rational(9, 10), new Rational(10, 11),

                        new Rational(7, 8), new Rational(9, 10), new Rational(10, 11),