commit cd620ea498e8cf34593fba2126ca7bf9b1c91044
author Steve Pfetsch <spfetsch@google.com> Thu Oct 20 12:33:23 2016 -0700
committer Steve Pfetsch <spfetsch@google.com> Thu Oct 20 12:38:22 2016 -0700
tree 902013a30559d3587271e7b723c408d5f5dd386b
parent fa3d1d389b731aa86b376da4d8d23cfb0039c81d

msm8996: 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: I4cad366a9912942aeaab2d8d6c316835f85dc3e3

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 8bba9ed..6765267 100644
--- a/msm8996/sdm/libs/hwc2/hwc_display.cpp
+++ b/msm8996/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;
 }