Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eae52a7 authored by Marin Shalamanov's avatar Marin Shalamanov Committed by Automerger Merge Worker
Browse files

Merge "SF: Check the active mode for nullptr in dumpsys" into sc-dev am: 69cd4db5 am: 1fd10043 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14441117

Change-Id: I660ec3df04f8e61a1e7fe3bfa173c4d2383e813c
parents 765b252b 1fd10043

services/surfaceflinger/DisplayDevice.cpp

+2 −1
Original line number Diff line number Diff line
@@ -268,8 +268,9 @@ void DisplayDevice::dump(std::string& result) const { 
    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");