diff options
| author | John Reck <jreck@google.com> | 2017-05-24 00:48:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-24 00:48:30 +0000 |
| commit | 1f7f8bfddb479ad35073e5e81d56a9c1308cf08e (patch) | |
| tree | 74a96b17b2d01307410675ec295a16de87794528 /libs/hwui/renderstate/RenderState.cpp | |
| parent | 1684ae9ba56e2c23e8c73ac82fc4215e62464ec9 (diff) | |
| parent | c1affe14c20a593df4818e927052be4b6b2de1f6 (diff) | |
Merge "Fix null deref crash" into oc-dev
am: c1affe14c2
Change-Id: Ib8e4c34fb38400dc748b463c5ab965d57e260fd0
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 9bce27a74cfa..481932dd7967 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); } |