diff options
| author | John Reck <jreck@google.com> | 2014-12-01 22:39:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-01 22:39:31 +0000 |
| commit | 76de89820c51c4bc288b440a82374b9d6c806244 (patch) | |
| tree | bac5be532ce1ef3c84c973752529a5cccfbb374a /libs/hwui | |
| parent | e6bd61d5bbea012b6b80c8bff915042f615630bc (diff) | |
| parent | a12b2405df5c12363e24cebc684f5f3a5c9a5b7b (diff) | |
| download | frameworks_base-76de89820c51c4bc288b440a82374b9d6c806244.zip frameworks_base-76de89820c51c4bc288b440a82374b9d6c806244.tar.gz frameworks_base-76de89820c51c4bc288b440a82374b9d6c806244.tar.bz2 | |
Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
Diffstat (limited to 'libs/hwui')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 39528be..aa32541 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -60,6 +60,7 @@ CanvasContext::~CanvasContext() { void CanvasContext::destroy() { stopDrawing(); + setSurface(NULL); freePrefetechedLayers(); destroyHardwareResources(); mAnimationContext->destroy(); @@ -67,7 +68,6 @@ void CanvasContext::destroy() { delete mCanvas; mCanvas = 0; } - setSurface(NULL); } void CanvasContext::setSurface(ANativeWindow* window) { |