commit 0cb089c94f42487d9de61d3eeb3070b61c5c125a
author Alec Mouri <alecmouri@google.com> Mon May 06 12:58:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 06 12:58:48 2019 -0700
tree d2ef62c652295ca433a7d41cb3b0a403aba0e668
parent 5d57eb200664c3e64128ae2eb29d28d12aa48f21
parent 09cf769b63971f9eccf355d5bf747563c296c233

Merge "Always enable backpressure propagation during GPU composition" into qt-dev
am: 09cf769b63

Change-Id: Ie440d29e7d1dd1b151fc0d94807d553f55a7d640

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index b2abe18..f8745f7 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1632,7 +1632,7 @@
             }
 
             // For now, only propagate backpressure when missing a hwc frame.
-            if (hwcFrameMissed) {
+            if (hwcFrameMissed && !gpuFrameMissed) {
                 if (mPropagateBackpressure) {
                     signalLayerUpdate();
                     break;