| commit | 583b1b32191992d6ada58b3c61c71932a71c0c4b | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
BQ: Prevent operations on disconnected BQs - Update unit tests to match Bug 23763412 Change-Id: I77e59bf6b57b328433c3835450455f80a8fa454b
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp index 94f30d5..0880a44 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
@@ -476,7 +476,8 @@ return NO_ERROR; } -void VirtualDisplaySurface::cancelBuffer(int pslot, const sp<Fence>& fence) { +status_t VirtualDisplaySurface::cancelBuffer(int pslot, + const sp<Fence>& fence) { if (mDisplayId < 0) return mSource[SOURCE_SINK]->cancelBuffer(mapProducer2SourceSlot(SOURCE_SINK, pslot), fence);