commit 69cd4db5da2b95859eb73e9322606ca53d1ad9e7
author Marin Shalamanov <shalamanov@google.com> Tue May 11 17:12:21 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 11 17:12:21 2021 +0000
tree 29af3b867c97e4c6f81438e0467233e47a85fe64
parent d71ed7c9b106d1e4af3077081f3764906a5f92bf
parent 84b854872b937a67db8a0e768a0be8ed41a246f7

Merge "SF: Check the active mode for nullptr in dumpsys" into sc-dev

services/surfaceflinger/DisplayDevice.cpp

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