commit 66d5b49155ea351fd755d225719fc7be1111bca4
author Naseer Ahmed <naseer@codeaurora.org> Thu Feb 23 20:30:17 2017 -0500
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Feb 27 12:31:59 2017 -0800
tree 04374aa1b76edb46aef336993eb0fe35f8257675
parent b08b43ff0b8663589f0e4cd70adfe8cfde780a4b

hwc2: Fix dumpsys bug

Pass the correct size of dump.
CRs-Fixed: 2011174
Change-Id: I6bb1b78a84bd996c780875811bec1020dff648e3

sdm/libs/hwc2/hwc_session.cpp

diff --git a/sdm/libs/hwc2/hwc_session.cpp b/sdm/libs/hwc2/hwc_session.cpp
index b497a36..d514e74 100644
--- a/sdm/libs/hwc2/hwc_session.cpp
+++ b/sdm/libs/hwc2/hwc_session.cpp
@@ -32,6 +32,7 @@
 #include <utils/debug.h>
 #include <sync/sync.h>
 #include <profiler.h>
+#include <algorithm>
 #include <string>
 #include <bitset>
 
@@ -283,9 +284,10 @@
     return;
   }
   auto *hwc_session = static_cast<HWCSession *>(device);
+  const size_t max_dump_size = 8192;
 
   if (out_buffer == nullptr) {
-    *out_size = 8192;  // TODO(user): Adjust required dump size
+    *out_size = max_dump_size;
   } else {
     char sdm_dump[4096];
     DumpInterface::GetDump(sdm_dump, 4096);  // TODO(user): Fix this workaround
@@ -296,8 +298,8 @@
       }
     }
     s += sdm_dump;
-    s.copy(out_buffer, s.size(), 0);
-    *out_size = sizeof(out_buffer);
+    auto copied = s.copy(out_buffer, std::min(s.size(), max_dump_size), 0);
+    *out_size = UINT32(copied);
   }
 }