Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deadlock in render thread when Bitmap.prepareToDraw is invoked

Browse Source 
Fix a deadlock with Skia pipelines, caused by calling
Bitmap::getSkBitmap from render thread.

Test: built and booted an image. Ran recent apps activity.
bug: 35060578
bug: 34926691
Change-Id: Iaf7957b955d938b722b153d72ad832ae5d50e86f
This commit is contained in:
Stan Iliev
2017-02-02 14:11:53 -05:00
parent f6387d8a51
commit 6983bc40d7
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/hwui/renderthread/RenderProxy.cpp
View File

@@ -667,11 +667,17 @@ CREATE_BRIDGE3(copyGraphicBufferInto, RenderThread* thread, GraphicBuffer* buffe
}
int RenderProxy::copyGraphicBufferInto(GraphicBuffer* buffer, SkBitmap* bitmap) {
SETUP_TASK(copyGraphicBufferInto);
args->thread = &RenderThread::getInstance();
args->bitmap = bitmap;
args->buffer = buffer;
return static_cast<int>(reinterpret_cast<intptr_t>(staticPostAndWait(task)));
RenderThread& thread = RenderThread::getInstance();
if (Properties::isSkiaEnabled() && gettid() == thread.getTid()) {
//TODO: fix everything that hits this. We should never be triggering a readback ourselves.
return (int) thread.readback().copyGraphicBufferInto(buffer, bitmap);
} else {
SETUP_TASK(copyGraphicBufferInto);
args->thread = &thread;
args->bitmap = bitmap;
args->buffer = buffer;
return static_cast<int>(reinterpret_cast<intptr_t>(staticPostAndWait(task)));
}
}
void RenderProxy::post(RenderTask* task) {
@@ -690,6 +696,7 @@ void* RenderProxy::postAndWait(MethodInvokeRenderTask* task) {
void* RenderProxy::staticPostAndWait(MethodInvokeRenderTask* task) {
RenderThread& thread = RenderThread::getInstance();
LOG_ALWAYS_FATAL_IF(gettid() == thread.getTid());
void* retval;
task->setReturnPtr(&retval);
thread.queueAndWait(task);