diff options
| author | Chris Craik <ccraik@android.com> | 2014-06-17 01:31:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-17 01:31:16 +0000 |
| commit | 11a8d4f8b99549262bcc9b64efe8ca21801c8f91 (patch) | |
| tree | 825eae667d1106b0b25cca7be6532ab1a4376b13 /libs | |
| parent | 658639c6bc43d06557be68f3b48d3263531b90e5 (diff) | |
| parent | 678886fde5cd779de79f8e38479aa6de82f8e755 (diff) | |
| download | frameworks_base-11a8d4f8b99549262bcc9b64efe8ca21801c8f91.zip frameworks_base-11a8d4f8b99549262bcc9b64efe8ca21801c8f91.tar.gz frameworks_base-11a8d4f8b99549262bcc9b64efe8ca21801c8f91.tar.bz2 | |
am 678886fd: am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence"
* commit '678886fde5cd779de79f8e38479aa6de82f8e755':
hwui: fix possible null pointer de-refrence
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/LayerRenderer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp index df9aee5..a5fd375 100644 --- a/libs/hwui/LayerRenderer.cpp +++ b/libs/hwui/LayerRenderer.cpp @@ -334,8 +334,10 @@ void LayerRenderer::destroyLayerDeferred(Layer* layer) { void LayerRenderer::flushLayer(Layer* layer) { #ifdef GL_EXT_discard_framebuffer + if (!layer) return; + GLuint fbo = layer->getFbo(); - if (layer && fbo) { + if (fbo) { // If possible, discard any enqueud operations on deferred // rendering architectures if (Extensions::getInstance().hasDiscardFramebuffer()) { |