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

Commit c6d6456d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add display Power Mode information while layer dumps" into sc-v2-dev... 

Merge "Add display Power Mode information while layer dumps" into sc-v2-dev am: 6257c5fd am: a17adeee

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

Change-Id: I6a982c02bf92731d6f3947805d83740ff34e4af8
parents 3bd61063 a17adeee

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -5146,7 +5146,8 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, std::string& result) co 
            continue;

        }



        StringAppendF(&result, "Display %s HWC layers:\n", to_string(*displayId).c_str());

        StringAppendF(&result, "Display %s (%s) HWC layers:\n", to_string(*displayId).c_str(),

                      (isDisplayActiveLocked(display) ? "active" : "inactive"));

        Layer::miniDumpHeader(result);



        const DisplayDevice& ref = *display;

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ private: 


    sp<DisplayDevice> getDisplayWithInputByLayer(Layer* layer) const REQUIRES(mStateLock);



    bool isDisplayActiveLocked(const sp<const DisplayDevice>& display) REQUIRES(mStateLock) {

    bool isDisplayActiveLocked(const sp<const DisplayDevice>& display) const REQUIRES(mStateLock) {

        return display->getDisplayToken() == mActiveDisplayToken;

    }