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

Commit b56d8b02 authored by Peiyong Lin's avatar Peiyong Lin Committed by android-build-merger
Browse files

Merge "Add is protected bit into dumpsys." into qt-dev 

am: 6c7d5c27

Change-Id: I83639ed33519dadfa87c15a0b20156c261db4171
parents cb69d406 6c7d5c27

services/surfaceflinger/Layer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1898,6 +1898,7 @@ void Layer::writeToProto(LayerProto* layerInfo, LayerVector::StateSet stateSet, 


        layerInfo->set_is_opaque(isOpaque(state));

        layerInfo->set_invalidate(contentDirty);

        layerInfo->set_is_protected(isProtected());



        // XXX (b/79210409) mCurrentDataSpace is not protected

        layerInfo->set_dataspace(

services/surfaceflinger/layerproto/LayerProtoParser.cpp

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ std::string LayerProtoParser::Layer::to_string() const { 


    StringAppendF(&result, "crop=%s, ", crop.to_string().c_str());

    StringAppendF(&result, "cornerRadius=%f, ", cornerRadius);

    StringAppendF(&result, "isProtected=%1d, ", isProtected);

    StringAppendF(&result, "isOpaque=%1d, invalidate=%1d, ", isOpaque, invalidate);

    StringAppendF(&result, "dataspace=%s, ", dataspace.c_str());

    StringAppendF(&result, "defaultPixelFormat=%s, ", pixelFormat.c_str());