diff options
| author | John Reck <jreck@google.com> | 2014-12-01 21:35:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 21:35:40 +0000 |
| commit | d51205fda7351ca32e54ef34b32e72f6c7c79847 (patch) | |
| tree | 5e99b6642ba777f398bdb06f3fb0cbc652bb3823 /libs/hwui/renderthread | |
| parent | b5981aa8d18dbd952ff74a75f962d4ec98f38807 (diff) | |
| parent | 6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3 (diff) | |
| download | frameworks_base-d51205fda7351ca32e54ef34b32e72f6c7c79847.zip frameworks_base-d51205fda7351ca32e54ef34b32e72f6c7c79847.tar.gz frameworks_base-d51205fda7351ca32e54ef34b32e72f6c7c79847.tar.bz2 | |
am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"
* commit '6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3':
Prevent calling GL functions with an invalid surface
Diffstat (limited to 'libs/hwui/renderthread')
| -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 b50a433..92a30e5 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -59,6 +59,7 @@ CanvasContext::~CanvasContext() { void CanvasContext::destroy() { stopDrawing(); + setSurface(NULL); freePrefetechedLayers(); destroyHardwareResources(); mAnimationContext->destroy(); @@ -66,7 +67,6 @@ void CanvasContext::destroy() { delete mCanvas; mCanvas = 0; } - setSurface(NULL); } void CanvasContext::setSurface(ANativeWindow* window) { |