diff options
| author | John Reck <jreck@google.com> | 2014-12-01 21:28:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-01 21:28:27 +0000 |
| commit | 6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3 (patch) | |
| tree | 5e99b6642ba777f398bdb06f3fb0cbc652bb3823 | |
| parent | ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3 (diff) | |
| parent | f76d36f96bf221672e98e440c9df7cbf0e02e84e (diff) | |
| download | frameworks_base-6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3.zip frameworks_base-6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3.tar.gz frameworks_base-6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3.tar.bz2 | |
Merge "Prevent calling GL functions with an invalid surface"
| -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) { |