| commit | 13851a791dbe4e3faa2f99cd82a0e0378ee2ab9e | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Wed May 24 00:54:59 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 24 00:54:59 2017 +0000 |
| tree | 2e4a4996e7e5e4fc3e82e6c70bc1eba8053d95bc | |
| parent | b9cebc259710a924fb03112c910c35c0a88a6851 [diff] | |
| parent | 1f7f8bfddb479ad35073e5e81d56a9c1308cf08e [diff] |
Merge "Fix null deref crash" into oc-dev am: c1affe14c2 am: 1f7f8bfddb Change-Id: I0d82bb5d05f31e9a429517417a85d7c9fc9b2c60
diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp index 9bce27a7..481932d 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); }