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

Merge "Fix a crash when grContext was deleted"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-02 16:05:37 +00:00
committed by Android (Google) Code Review
parent d8b4d19843 6c4b6e8b0e
commit c9f8854482
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,14 +356,21 @@ void RenderProxy::disableVsync() {
void RenderProxy::repackVectorDrawableAtlas() {
RenderThread& thread = RenderThread::getInstance();
thread.queue().post([&thread]() {
thread.cacheManager().acquireVectorDrawableAtlas()->repackIfNeeded(thread.getGrContext());
// The context may be null if trimMemory executed, but then the atlas was deleted too.
if (thread.getGrContext() != nullptr) {
thread.cacheManager().acquireVectorDrawableAtlas()->repackIfNeeded(
thread.getGrContext());
}
});
}
void RenderProxy::releaseVDAtlasEntries() {
RenderThread& thread = RenderThread::getInstance();
thread.queue().post([&thread]() {
thread.cacheManager().acquireVectorDrawableAtlas()->delayedReleaseEntries();
// The context may be null if trimMemory executed, but then the atlas was deleted too.
if (thread.getGrContext() != nullptr) {
thread.cacheManager().acquireVectorDrawableAtlas()->delayedReleaseEntries();
}
});
}