merge in nyc-mr1-release history after reset to nyc-mr1-dev
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;
}