commit 0801473321553b9f0e772d6a44c53ddcf12fc5ac
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 28 16:15:30 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 28 16:15:30 2019 +0000
tree 2167f08ceb03f007de364c3abc66d91b9e3ee9e7
parent e72ecd3e9c79eaca73bd63dcf4b7d25fd2e94f93
parent 0059724cf8d83b018be2b55dc400166fe86e2af4

Merge "blast: fix caching crash"

libs/gui/SurfaceComposerClient.cpp

diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 84aed5f..56a3fbc 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -406,6 +406,12 @@
             continue;
         }
 
+        // Don't try to cache a null buffer. Sending null buffers is cheap so we shouldn't waste
+        // time trying to cache them.
+        if (!s->buffer) {
+            continue;
+        }
+
         uint64_t cacheId = 0;
         status_t ret = BufferCache::getInstance().getCacheId(s->buffer, &cacheId);
         if (ret == NO_ERROR) {