commit 934e0cf8ee90f54da283f77f54b97fd8ed4934bd
author Alec Mouri <alecmouri@google.com> Tue Feb 09 14:54:10 2021 -0800
committer Alec Mouri <alecmouri@google.com> Tue Feb 09 15:46:39 2021 -0800
tree 846cf0caa01d7789946287f92a9aa337ef086487
parent 4cd01842d4b1ba10eed64fd947c03b53c4fe3105

Only dump active display mode when it exists.

Otherwise, capturing a bugreport while running a screenrecord crashes
the device.

Bug: 179301292
Test: builds, boots
Change-Id: Ic9412ae4af159e97e884355f01d25b8acb3e7883

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index a785968..c751f22 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -265,7 +265,8 @@
     StringAppendF(&result, "+ %s\n", getDebugName().c_str());
     StringAppendF(&result, "   powerMode=%s (%d)\n", to_string(mPowerMode).c_str(),
                   static_cast<int32_t>(mPowerMode));
-    StringAppendF(&result, "   activeMode=%s\n", to_string(*getActiveMode()).c_str());
+    StringAppendF(&result, "   activeMode=%s\n",
+                  mSupportedModes.size() ? to_string(*getActiveMode()).c_str() : "none");
 
     result.append("   supportedModes=\n");