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

Commit 16ae0cf1 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Add more virtual display tests."

parents 7a54069a f724c277

core/tests/coretests/AndroidManifest.xml

+5 −1
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ 
    <uses-permission android:name="android.permission.ASEC_RENAME" />

    <uses-permission android:name="android.permission.SHUTDOWN" />



    <!-- virtual display test permissions -->

    <uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />

    <uses-permission android:name="android.permission.CAPTURE_SECURE_VIDEO_OUTPUT" />



    <!-- accessibility test permissions -->

    <uses-permission android:name="android.permission.RETRIEVE_WINDOW_CONTENT" />

core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java

0 → 100644
+508 −0

File added.

Preview size limit exceeded, changes collapsed.

media/jni/android_media_ImageReader.cpp

+3 −2
Original line number Diff line number Diff line
@@ -701,11 +701,12 @@ static jboolean ImageReader_imageSetup(JNIEnv* env, jobject thiz, 
    }

    status_t res = consumer->lockNextBuffer(buffer);

    if (res != NO_ERROR) {

        if (res != BAD_VALUE /*no buffers*/) {

            ALOGE("%s Fail to lockNextBuffer with error: %d ", __FUNCTION__, res);

        }

        return false;

    }





    // Check if the left-top corner of the crop rect is origin, we currently assume this point is

    // zero, will revist this once this assumption turns out problematic.

    Point lt = buffer->crop.leftTop();