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

Commit fb09bcf9 authored by Robert Carr's avatar Robert Carr
Browse files

Correct screenshot JNI code. 

Missed change to frameworks/base when changing type to signed int.
Previous code was relying on implicit cast of -1 to unsigned being INT_MAX.

Test: Rotate screen make sure no flash.
Change-Id: I779d851bdc211f24aed0095a4b6df38fd53153b4
Fixes: 34735633
parent b9a2b54a

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,