Merge "libgui: Add null pointer check in setDisplaySurface" into nyc-mr1-dev

1 files changed, 10 insertions, 8 deletions

diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 7ed12b7bb4..b78de2ea59 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -475,14 +475,16 @@ DisplayState& Composer::getDisplayStateLocked(const sp<IBinder>& token) {
 
 status_t Composer::setDisplaySurface(const sp<IBinder>& token,
         sp<IGraphicBufferProducer> bufferProducer) {
-    // Make sure that composition can never be stalled by a virtual display
-    // consumer that isn't processing buffers fast enough.
-    status_t err = bufferProducer->setAsyncMode(true);
-    if (err != NO_ERROR) {
-        ALOGE("Composer::setDisplaySurface Failed to enable async mode on the "
-                "BufferQueue. This BufferQueue cannot be used for virtual "
-                "display. (%d)", err);
-        return err;
+    if (bufferProducer.get() != nullptr) {
+        // Make sure that composition can never be stalled by a virtual display
+        // consumer that isn't processing buffers fast enough.
+        status_t err = bufferProducer->setAsyncMode(true);
+        if (err != NO_ERROR) {
+            ALOGE("Composer::setDisplaySurface Failed to enable async mode on the "
+                    "BufferQueue. This BufferQueue cannot be used for virtual "
+                    "display. (%d)", err);
+            return err;
+        }
     }
     Mutex::Autolock _l(mLock);
     DisplayState& s(getDisplayStateLocked(token));