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

Commit a17adeee 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 am: 6257c5fd 

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

Change-Id: Ia6ff5b42e0f2646aa8c612a0d9c0e35c859e5fe5
parents 3e1425e6 6257c5fd

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -5149,7 +5149,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
@@ -1010,7 +1010,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;

    }