commit 66227f74eb2b283fa5ad09bde9ca74d69bfafcc2
author Steve Pfetsch <spfetsch@google.com> Thu Oct 20 12:41:08 2016 -0700
committer Steve Pfetsch <spfetsch@google.com> Thu Oct 20 12:42:21 2016 -0700
tree 2cceddf6a56b04a38f0f0db27329cf5183c3835a
parent cd620ea498e8cf34593fba2126ca7bf9b1c91044

msmcobalt: hwc2: check for null layers in layer map

As video playback ends, there's an opportunity for one or more layers in
the layer map to become null. Added a check before using the layer.

Bug: 32221503
Change-Id: I2c1748db32e3bd615b5784d418feda420f0afcc8

msmcobalt/sdm/libs/hwc2/hwc_display.cpp

diff --git a/msmcobalt/sdm/libs/hwc2/hwc_display.cpp b/msmcobalt/sdm/libs/hwc2/hwc_display.cpp
index 772d2c7..6bda91f 100644
--- a/msmcobalt/sdm/libs/hwc2/hwc_display.cpp
+++ b/msmcobalt/sdm/libs/hwc2/hwc_display.cpp
@@ -781,7 +781,12 @@
   for (const auto& change : layer_changes_) {
     auto hwc_layer = layer_map_[change.first];
     auto composition = change.second;
-    hwc_layer->UpdateClientCompositionType(composition);
+
+    if (hwc_layer == nullptr) {
+      DLOGI("Null layer in HWCDisplay::AcceptDisplayChanges.");
+    } else {
+      hwc_layer->UpdateClientCompositionType(composition);
+    }
   }
   return HWC2::Error::None;
 }