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

Commit c7fbebe8 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 0a289c9c: am 4ceff3d5: screenshot layers wouldn\'t work in some cases 

* commit '0a289c9c':
  screenshot layers wouldn't work in some cases
parents a8113c12 0a289c9c

services/surfaceflinger/Layer.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -991,6 +991,8 @@ Region Layer::latchBuffer(bool& recomputeVisibleRegions) 
                    if (front.active.w != bufWidth ||

                    if (front.active.w != bufWidth ||

                        front.active.h != bufHeight) {

                        front.active.h != bufHeight) {

                        // reject this buffer

                        // reject this buffer

                        //ALOGD("rejecting buffer: bufWidth=%d, bufHeight=%d, front.active.{w=%d, h=%d}",

                        //        bufWidth, bufHeight, front.active.w, front.active.h);

                        return true;

                        return true;

                    }

                    }

                }

                }

services/surfaceflinger/SurfaceFlinger.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -2769,6 +2769,7 @@ status_t SurfaceFlinger::captureScreenImplLocked( 




        int err = 0;

        int err = 0;

        err = native_window_set_buffers_dimensions(window, reqWidth, reqHeight);

        err = native_window_set_buffers_dimensions(window, reqWidth, reqHeight);

        err |= native_window_set_scaling_mode(window, NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW);

        err |= native_window_set_buffers_format(window, HAL_PIXEL_FORMAT_RGBA_8888);

        err |= native_window_set_buffers_format(window, HAL_PIXEL_FORMAT_RGBA_8888);

        err |= native_window_set_usage(window, usage);

        err |= native_window_set_usage(window, usage);