commit 8aa99e0056a9bf8c701510589c6f958ab3068747
author Linux Build Service Account <lnxbuild@quicinc.com> Sun Jul 09 02:34:29 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Jul 09 02:34:29 2017 -0700
tree 86f8543318531cf79ae130fee7bdd8d5d9628583
parent 1d4c70354ef4c2c0c7184e24d92b5d300870e03f
parent 2f71fd04488fff7fe598d441a950a8def1929020

Merge "hwc2: Check composition type in SetLayerBuffer"

sdm/libs/hwc2/hwc_layers.cpp

diff --git a/sdm/libs/hwc2/hwc_layers.cpp b/sdm/libs/hwc2/hwc_layers.cpp
index cd7a428..015dc75 100644
--- a/sdm/libs/hwc2/hwc_layers.cpp
+++ b/sdm/libs/hwc2/hwc_layers.cpp
@@ -91,8 +91,13 @@
 
 HWC2::Error HWCLayer::SetLayerBuffer(buffer_handle_t buffer, int32_t acquire_fence) {
   if (!buffer) {
-    DLOGE("Invalid buffer handle: %p on layer: %d", buffer, id_);
-    return HWC2::Error::BadParameter;
+    if (client_requested_ == HWC2::Composition::Device ||
+        client_requested_ == HWC2::Composition::Cursor) {
+      DLOGE("Invalid buffer handle: %p on layer: %d", buffer, id_);
+      return HWC2::Error::BadParameter;
+    } else {
+      return HWC2::Error::None;
+    }
   }
 
   if (acquire_fence == 0) {