commit 583b1b32191992d6ada58b3c61c71932a71c0c4b
author Pablo Ceballos <pceballos@google.com> Thu Sep 03 18:23:52 2015 -0700
committer Pablo Ceballos <pceballos@google.com> Fri Sep 18 11:43:09 2015 -0700
tree 2c8daa3613d25df62529580ec167879b6b0cc5c5
parent 643a34c3b4dcacf3303ec33b590ca9067e475169

BQ: Prevent operations on disconnected BQs

- Update unit tests to match

Bug 23763412

Change-Id: I77e59bf6b57b328433c3835450455f80a8fa454b

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h

diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
index 5807eb1..91e94f1 100644
--- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
+++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
@@ -108,7 +108,7 @@
     virtual status_t attachBuffer(int* slot, const sp<GraphicBuffer>& buffer);
     virtual status_t queueBuffer(int pslot,
             const QueueBufferInput& input, QueueBufferOutput* output);
-    virtual void cancelBuffer(int pslot, const sp<Fence>& fence);
+    virtual status_t cancelBuffer(int pslot, const sp<Fence>& fence);
     virtual int query(int what, int* value);
     virtual status_t connect(const sp<IProducerListener>& listener,
             int api, bool producerControlledByApp, QueueBufferOutput* output);