commit f3c07d4f70f33c2fe5b14ca8fbcdfa4133cc72c7
author Dan Stoza <stoza@google.com> Tue Feb 04 16:22:36 2014 -0800
committer Andy McFadden <fadden@android.com> Tue Apr 22 16:19:02 2014 -0700
tree 8b3fccb42c2dd684ca7e5a295bf7cde91069a560
parent cf818ebbf07c6a20ef48d71bf82f8d4bdf3a398c

Fix virtual display nesting

This fixes the cycling rendering loop caused by nesting virtual
displays by preventing them from recomposing if their contents
haven't changed.

(cherry-pick from master I600365c0fd5d3ad93e04295d26cf9de177ffc79b)

Bug: 12101046
Change-Id: I6182993d53537781aedb522f97a50f06eed8b80f

services/surfaceflinger/DisplayHardware/FramebufferSurface.h

diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.h b/services/surfaceflinger/DisplayHardware/FramebufferSurface.h
index 1d67446..ba72ce3 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.h
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.h
@@ -39,7 +39,7 @@
 public:
     FramebufferSurface(HWComposer& hwc, int disp, const sp<IGraphicBufferConsumer>& consumer);
 
-    virtual status_t beginFrame();
+    virtual status_t beginFrame(bool mustRecompose);
     virtual status_t prepareFrame(CompositionType compositionType);
     virtual status_t compositionComplete();
     virtual status_t advanceFrame();