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

Commit c12176a8 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "Correct screenshot JNI code."

parents be3c77bf fb09bcf9

core/jni/android_view_SurfaceControl.cpp

+6 −6
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ static jobject nativeScreenshotToBuffer(JNIEnv* env, jclass clazz, 
    }

    Rect sourceCrop = rectFromObj(env, sourceCropObj);

    if (allLayers) {

        minLayer = 0;

        maxLayer = -1;

        minLayer = INT32_MIN;

        maxLayer = INT32_MAX;

    }

    sp<GraphicBuffer> buffer;

    status_t res = ScreenshotClient::captureToBuffer(displayToken,
@@ -181,8 +181,8 @@ static jobject nativeScreenshotBitmap(JNIEnv* env, jclass clazz, 
    std::unique_ptr<ScreenshotClient> screenshot(new ScreenshotClient());

    status_t res;

    if (allLayers) {

        minLayer = 0;

        maxLayer = -1;

        minLayer = INT32_MIN;

        maxLayer = INT32_MAX;

    }



    res = screenshot->update(displayToken, sourceCrop, width, height,
@@ -254,8 +254,8 @@ static void nativeScreenshot(JNIEnv* env, jclass clazz, jobject displayTokenObj, 
            Rect sourceCrop(left, top, right, bottom);



            if (allLayers) {

                minLayer = 0;

                maxLayer = -1;

                minLayer = INT32_MIN;

                maxLayer = INT32_MAX;

            }

            ScreenshotClient::capture(displayToken,

                    consumer->getIGraphicBufferProducer(), sourceCrop,