diff options
| author | John Reck <jreck@google.com> | 2014-12-01 21:40:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 21:40:32 +0000 |
| commit | d7af6eaace4ffdd3635a1cdeff65e9dc1af39f67 (patch) | |
| tree | db08af2392b33783928c8ff5954301131d5e09aa /libs/hwui/renderthread/CanvasContext.cpp | |
| parent | b62b1b03792e7c583ec1a51a3d621deb51663414 (diff) | |
| parent | d51205fda7351ca32e54ef34b32e72f6c7c79847 (diff) | |
am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"
* commit 'd51205fda7351ca32e54ef34b32e72f6c7c79847':
Prevent calling GL functions with an invalid surface
Diffstat (limited to 'libs/hwui/renderthread/CanvasContext.cpp')
| -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 118e12465e1b..6fdf65e6722d 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) { |