commit dd9275badd28ecf84d7bf756cdccb01bf770aa3d
author gitbuildkicker <android-build@google.com> Tue Oct 25 00:06:24 2016 -0700
committer gitbuildkicker <android-build@google.com> Tue Oct 25 00:06:24 2016 -0700
tree 010f14ec35ad1ab96659a7d3dd18d33a64e6317f
parent 325fd2d3b89c9dd2c7f11c39b6317add7909b78c
parent 032f0147d0ac0beac0d9f1cae327541fa1f03939

merge in nyc-mr1-release history after reset to nyc-mr1-dev

msm8996/sdm/libs/hwc2/hwc_display.cpp

diff --git a/msm8996/sdm/libs/hwc2/hwc_display.cpp b/msm8996/sdm/libs/hwc2/hwc_display.cpp
index 90d1403..3287a7f 100644
--- a/msm8996/sdm/libs/hwc2/hwc_display.cpp
+++ b/msm8996/sdm/libs/hwc2/hwc_display.cpp
@@ -774,7 +774,11 @@
 }
 
 HWC2::Error HWCDisplay::AcceptDisplayChanges() {
-  if (!validated_ && !layer_set_.empty()) {
+  if (layer_set_.empty()) {
+    return HWC2::Error::None;
+  }
+
+  if (!validated_) {
     return HWC2::Error::NotValidated;
   }