diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-24 00:41:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-24 00:41:23 +0000 |
commit | c1affe14c20a593df4818e927052be4b6b2de1f6 (patch) | |
tree | f857b0321faeeae3a37462ce60876e9466abd7af /libs/hwui/renderstate/RenderState.cpp | |
parent | 6c6d37d416caba0270e50d816e12d874dc8dc70c (diff) | |
parent | 36393c3e8da725927357d7a235c18e2f6c1aea98 (diff) |
Merge "Fix null deref crash" into oc-dev
Diffstat (limited to 'libs/hwui/renderstate/RenderState.cpp')
-rw-r--r-- | libs/hwui/renderstate/RenderState.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp index b89272ebd486..ed96d49bbc15 100644 --- a/libs/hwui/renderstate/RenderState.cpp +++ b/libs/hwui/renderstate/RenderState.cpp @@ -123,7 +123,7 @@ void RenderState::flush(Caches::FlushMode mode) { } void RenderState::onBitmapDestroyed(uint32_t pixelRefId) { - if (mCaches->textureCache.destroyTexture(pixelRefId)) { + if (mCaches && mCaches->textureCache.destroyTexture(pixelRefId)) { glFlush(); GL_CHECKPOINT(MODERATE); } |