commit be597daebd63feeb786855f8af6c96a706eb283c
author Fabien Sanglard <sanglardf@google.com> Thu Jun 22 19:56:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 22 19:56:31 2017 +0000
tree d8408bc4543f7459a87904fc31d448b7070f1fd2
parent 269c2361096cb8a17ea5fedbd20f800cd1b65d05
parent 98bfd4f5714c70c94d7a72efa29a1966fb0ea6a9

Merge "LibGUI remove DEBUG" into oc-dev

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 913c43f..3f953ea 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -460,7 +460,8 @@
 
     // First try to skip validate altogether if the HWC supports it.
     displayData.validateWasSkipped = false;
-    if (hasCapability(HWC2::Capability::SkipValidate)) {
+    if (hasCapability(HWC2::Capability::SkipValidate) &&
+            !displayData.hasClientComposition) {
         sp<android::Fence> outPresentFence;
         uint32_t state = UINT32_MAX;
         error = hwcDisplay->presentOrValidate(&numTypes, &numRequests, &outPresentFence , &state);