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

Commit 111928fa authored by John Reck's avatar John Reck
Browse files

resolved conflicts for merge of 4142f026 to master 

Change-Id: Iabe3aa0ac6911a26d2ba7219f18332897276ed6f
parents 1cef4196 4142f026

libs/hwui/renderthread/RenderProxy.cpp

+1 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ CREATE_BRIDGE2(dumpGraphicsMemory, int fd, RenderThread* thread) { 
}



void RenderProxy::dumpGraphicsMemory(int fd) {

    if (!RenderThread::hasInstance()) return;

    SETUP_TASK(dumpGraphicsMemory);

    args->fd = fd;

    args->thread = &RenderThread::getInstance();