commit fd47bdbb1c6c8f170c51886a4ef40240f642ecb9
author Alec Mouri <alecmouri@google.com> Mon May 06 13:13:01 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 06 13:13:01 2019 -0700
tree 2e66af3c2e24eb4e2c3474ef322b6b359d53559e
parent 362ea2bb7c9807d24a46f8b9e7d9329afd40c80b
parent 0cb089c94f42487d9de61d3eeb3070b61c5c125a

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

Change-Id: Ia90183c0f23119b6658aa04a5ffcb2d1951adbe0

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;