commit 78378f48713fa2b1262572c967428f96e45f709e
author Linux Build Service Account <lnxbuild@localhost> Mon Mar 12 21:15:46 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 12 21:15:46 2018 -0700
tree 77f6ef765407697945e9e6339bf9ee4baa9f973d
parent c836e192d6c0b7e984c652f87d9220740fae551b
parent 91438203cca3d03779e64ba7ef9d8ad5e6d71342

Merge "hwc: Reset stack invalidation state after Prepare"

sdm/libs/hwc2/hwc_display.cpp

diff --git a/sdm/libs/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp
index ed0223b..03aa7a1 100644
--- a/sdm/libs/hwc2/hwc_display.cpp
+++ b/sdm/libs/hwc2/hwc_display.cpp
@@ -634,8 +634,6 @@
   }
   // set secure display
   SetSecureDisplay(secure_display_active);
-
-  layer_stack_invalid_ = false;
 }
 
 void HWCDisplay::BuildSolidFillStack() {
@@ -1079,11 +1077,13 @@
   *out_num_types = UINT32(layer_changes_.size());
   *out_num_requests = UINT32(layer_requests_.size());
   skip_validate_ = false;
+  layer_stack_invalid_ = false;
+
   if (*out_num_types > 0) {
     return HWC2::Error::HasChanges;
-  } else {
-    return HWC2::Error::None;
   }
+
+  return HWC2::Error::None;
 }
 
 HWC2::Error HWCDisplay::AcceptDisplayChanges() {