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

Commit 5680227b authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Traverse layers in main thread. 

Currently we have to traverse layers in order to determine whether a
protected buffer must be allocated, however, screenshot functions are
called in binder threads most of the time and hence we ended up
traversing layers in binder threads, which is wrong. This patch
schedules the traverse to main thread.

Bug: b/172774482
Test: Protected video is visible during rotation
Test: traverse layers are in main thread in trace
Change-Id: Iefa6fec78586af00a28f87fa5641d5fff929b80f
parent 69df21f1

services/surfaceflinger/SurfaceFlinger.cpp

+8 −3
Original line number Diff line number Diff line
@@ -5660,9 +5660,14 @@ status_t SurfaceFlinger::captureScreenCommon(RenderAreaFuture renderAreaFuture, 
    const bool supportsProtected = getRenderEngine().supportsProtectedContent();

    bool hasProtectedLayer = false;

    if (allowProtected && supportsProtected) {

        hasProtectedLayer = schedule([=]() {

                                bool protectedLayerFound = false;

                                traverseLayers([&](Layer* layer) {

            hasProtectedLayer = hasProtectedLayer || (layer->isVisible() && layer->isProtected());

                                    protectedLayerFound = protectedLayerFound ||

                                            (layer->isVisible() && layer->isProtected());

                                });

                                return protectedLayerFound;

                            }).get();

    }



    const uint32_t usage = GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_RENDER |