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

Commit b86e2c76 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Unified format and Clearly traced opening recents" into main am: cb4d99b8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3484711



Change-Id: I6cade58d00fe35f264d3e60ddbb789612df79dac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7303d091 cb4d99b8

libs/hwui/renderthread/RenderProxy.cpp

+3 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ void RenderProxy::buildLayer(RenderNode* node) { 
}



bool RenderProxy::copyLayerInto(DeferredLayerUpdater* layer, SkBitmap& bitmap) {

    ATRACE_NAME("TextureView#getBitmap");

    ATRACE_NAME("RenderProxy#copyLayerInto readback");

    auto& thread = RenderThread::getInstance();

    return thread.queue().runSync([&]() -> bool {

        return thread.readback().copyLayerInto(layer, &bitmap) == CopyResult::Success;
@@ -473,7 +473,7 @@ void RenderProxy::prepareToDraw(Bitmap& bitmap) { 
}



int RenderProxy::copyHWBitmapInto(Bitmap* hwBitmap, SkBitmap* bitmap) {

    ATRACE_NAME("HardwareBitmap readback");

    ATRACE_NAME("RenderProxy#copyHWBitmapInto readback");

    RenderThread& thread = RenderThread::getInstance();

    if (RenderThread::isCurrent()) {

        // TODO: fix everything that hits this. We should never be triggering a readback ourselves.
@@ -485,6 +485,7 @@ int RenderProxy::copyHWBitmapInto(Bitmap* hwBitmap, SkBitmap* bitmap) { 
}



int RenderProxy::copyImageInto(const sk_sp<SkImage>& image, SkBitmap* bitmap) {

    ATRACE_NAME("RenderProxy#copyImageInto readback");

    RenderThread& thread = RenderThread::getInstance();

    if (RenderThread::isCurrent()) {

        // TODO: fix everything that hits this. We should never be triggering a readback ourselves.