commit 38c12eb937bb0770c162fcfabcbf881178cdc0a7
author Naseer Ahmed <naseer@codeaurora.org> Wed Jul 13 19:46:56 2016 -0400
committer Steve Pfetsch <spfetsch@google.com> Thu Jul 14 18:42:15 2016 -0700
tree c307c77ae68b1bc2b0872dd00a9fb4aec303c5cb
parent 88cc3f22647f6ab81085a550a2127cb1c6a24ed2

hwc2: Destroy virtual display properly

Initialize the virtual display object to null after deleting it.

Bug: 29945684
Change-Id: I41bfd3bcf5f22d8ce6e2973b22a6d6f26f4d2088

msm8996/sdm/libs/hwc2/hwc_session.cpp

diff --git a/msm8996/sdm/libs/hwc2/hwc_session.cpp b/msm8996/sdm/libs/hwc2/hwc_session.cpp
index 9344ed6..224b17e 100644
--- a/msm8996/sdm/libs/hwc2/hwc_session.cpp
+++ b/msm8996/sdm/libs/hwc2/hwc_session.cpp
@@ -234,9 +234,13 @@
 
   HWCSession *hwc_session = static_cast<HWCSession *>(device);
   auto status = hwc_session->CreateVirtualDisplayObject(width, height, format);
-  if (status == HWC2::Error::None)
+  if (status == HWC2::Error::None) {
     *out_display_id = HWC_DISPLAY_VIRTUAL;
-  DLOGI("Created virtual display id:% " PRIu64 " with res: %dx%d", *out_display_id, width, height);
+    DLOGI("Created virtual display id:% " PRIu64 " with res: %dx%d",
+          *out_display_id, width, height);
+  } else {
+    DLOGE("Failed to create virtual display: %s", to_string(status).c_str());
+  }
   return INT32(status);
 }
 
@@ -257,6 +261,7 @@
 
   if (hwc_session->hwc_display_[display]) {
     HWCDisplayVirtual::Destroy(hwc_session->hwc_display_[display]);
+    hwc_session->hwc_display_[display] = nullptr;
     return HWC2_ERROR_NONE;
   } else {
     return HWC2_ERROR_BAD_DISPLAY;