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

Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev

Browse Source
This commit is contained in:
John Reck
2014-12-01 22:39:29 +00:00
committed by Android (Google) Code Review
parent e6bd61d5bb a12b2405df
commit 76de89820c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/renderthread/CanvasContext.cpp
View File

@@ -60,6 +60,7 @@ CanvasContext::~CanvasContext() {
void CanvasContext::destroy() { void CanvasContext::destroy() {
stopDrawing(); stopDrawing();
setSurface(NULL);
freePrefetechedLayers(); freePrefetechedLayers();
destroyHardwareResources(); destroyHardwareResources();
mAnimationContext->destroy(); mAnimationContext->destroy();
@@ -67,7 +68,6 @@ void CanvasContext::destroy() {
delete mCanvas; delete mCanvas;
mCanvas = 0; mCanvas = 0;
} }
setSurface(NULL);
} }
void CanvasContext::setSurface(ANativeWindow* window) { void CanvasContext::setSurface(ANativeWindow* window) {