| commit | c1affe14c20a593df4818e927052be4b6b2de1f6 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 24 00:41:17 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 24 00:41:23 2017 +0000 |
| tree | f857b0321faeeae3a37462ce60876e9466abd7af | |
| parent | 6c6d37d416caba0270e50d816e12d874dc8dc70c [diff] | |
| parent | 36393c3e8da725927357d7a235c18e2f6c1aea98 [diff] |
Merge "Fix null deref crash" into oc-dev
diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp index b89272e..ed96d49 100644 --- a/libs/hwui/renderstate/RenderState.cpp +++ b/libs/hwui/renderstate/RenderState.cpp
@@ -123,7 +123,7 @@ } void RenderState::onBitmapDestroyed(uint32_t pixelRefId) { - if (mCaches->textureCache.destroyTexture(pixelRefId)) { + if (mCaches && mCaches->textureCache.destroyTexture(pixelRefId)) { glFlush(); GL_CHECKPOINT(MODERATE); }