commit 38140d3ef89de0ac3c8daefca26d29a79fcfb116
author Linux Build Service Account <lnxbuild@quicinc.com> Tue Aug 08 22:27:28 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 08 22:27:28 2017 -0700
tree 762b91c925377f63e8f31f951ac45e72ea847c33
parent 5163cab20abd67f80cf39de7ca5d0d2ebe0c267e
parent 5bb9ca35250bb439f300a4e92dfe1deb15539685

Merge "qdutils: Add dependency on libhardware headers"

sdm/libs/hwc2/hwc_color_manager.cpp

diff --git a/sdm/libs/hwc2/hwc_color_manager.cpp b/sdm/libs/hwc2/hwc_color_manager.cpp
index 6f33a6d..d753fdc 100644
--- a/sdm/libs/hwc2/hwc_color_manager.cpp
+++ b/sdm/libs/hwc2/hwc_color_manager.cpp
@@ -404,8 +404,8 @@
   };
 
   if (socket_fd_ < 0) {
-    DLOGW("No socket connection available!");
-    return -EFAULT;
+    DLOGW("No socket connection available - assuming dpps is not enabled");
+    return 0;
   }
 
   if (!enable) {  // if client requesting to disable it.

sdm/libs/hwc2/hwc_layers.h

diff --git a/sdm/libs/hwc2/hwc_layers.h b/sdm/libs/hwc2/hwc_layers.h
index 30fc362..25ec4dc 100644
--- a/sdm/libs/hwc2/hwc_layers.h
+++ b/sdm/libs/hwc2/hwc_layers.h
@@ -119,7 +119,7 @@
 };
 
 struct SortLayersByZ {
-  bool operator()(const HWCLayer *lhs, const HWCLayer *rhs) {
+  bool operator()(const HWCLayer *lhs, const HWCLayer *rhs) const {
     return lhs->GetZ() < rhs->GetZ();
   }
 };