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

Commit 3124628d authored by Dominik Laskowski's avatar Dominik Laskowski Committed by Automerger Merge Worker
Browse files

Merge changes from topics "presubmit-am-55f310f6061a4fdfa7811f47f62b8b5c",... 

Merge changes from topics "presubmit-am-55f310f6061a4fdfa7811f47f62b8b5c", "presubmit-am-f6a0ce426c734db58ba765fa00f5f38c" into tm-dev am: 3356367c

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



Change-Id: Ib34d8821c62f6adbabf289eee1c9833d964a537b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f9b58f3 3356367c

libs/ui/DeviceProductInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ status_t DeviceProductInfo::unflatten(void const* buffer, size_t size) { 
}



void DeviceProductInfo::dump(std::string& result) const {

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

    StringAppendF(&result, "{name=\"%s\", ", name.c_str());

    StringAppendF(&result, "manufacturerPnpId=%s, ", manufacturerPnpId.data());

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

services/surfaceflinger/CompositionEngine/include/compositionengine/ProjectionSpace.h

+7 −7
Original line number Diff line number Diff line
@@ -120,15 +120,15 @@ private: 


} // namespace compositionengine



inline std::string to_string(const android::compositionengine::ProjectionSpace& space) {

    return android::base::

            StringPrintf("ProjectionSpace(bounds = %s, content = %s, orientation = %s)",

inline std::string to_string(const compositionengine::ProjectionSpace& space) {

    return base::StringPrintf("ProjectionSpace{bounds=%s, content=%s, orientation=%s}",

                              to_string(space.getBoundsAsRect()).c_str(),

                         to_string(space.getContent()).c_str(), toCString(space.getOrientation()));

                              to_string(space.getContent()).c_str(),

                              toCString(space.getOrientation()));

}



// Defining PrintTo helps with Google Tests.

inline void PrintTo(const android::compositionengine::ProjectionSpace& space, ::std::ostream* os) {

inline void PrintTo(const compositionengine::ProjectionSpace& space, std::ostream* os) {

    *os << to_string(space);

}

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputCompositionState.h

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ struct OutputCompositionState { 
        SUCCESS = 1,

        // Composition strategy prediction failed for this frame.

        FAIL = 2,



        ftl_last = FAIL

    };



    CompositionStrategyPredictionState strategyPrediction =

services/surfaceflinger/CompositionEngine/src/Display.cpp

+4 −8
Original line number Diff line number Diff line
@@ -131,15 +131,11 @@ void Display::setColorProfile(const ColorProfile& colorProfile) { 
}



void Display::dump(std::string& out) const {

    using android::base::StringAppendF;



    StringAppendF(&out, "   Composition Display State: [\"%s\"]", getName().c_str());



    out.append("\n   ");

    dumpVal(out, "isVirtual", isVirtual());

    dumpVal(out, "DisplayId", to_string(mId));

    out.append("\n");

    const char* const type = isVirtual() ? "virtual" : "physical";

    base::StringAppendF(&out, "Display %s (%s, \"%s\")", to_string(mId).c_str(), type,

                        getName().c_str());



    out.append("\n   Composition Display State:\n");

    Output::dumpBase(out);

}

services/surfaceflinger/CompositionEngine/src/DumpHelpers.cpp

+4 −5
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ void dumpVal(std::string& out, const char* name, const Region& region) { 


void dumpVal(std::string& out, const char* name, const ui::Transform& transform) {

    transform.dump(out, name);

    out.append(" ");

}



void dumpVal(std::string& out, const char* name, const mat4& tr) {
@@ -109,9 +108,9 @@ void dumpVal(std::string& out, const char* name, const mat4& tr) { 
}



void dumpVal(std::string& out, const char* name, const StretchEffect& effect) {

    StringAppendF(&out, "%s={ width =%f, height = %f, vec=(%f, %f), max=(%f, %f) } ", name,

                  effect.width, effect.height,

                  effect.vectorX, effect.vectorY, effect.maxAmountX, effect.maxAmountY);

    StringAppendF(&out, "%s={width=%f, height=%f, vec=(%f, %f), max=(%f, %f)} ", name, effect.width,

                  effect.height, effect.vectorX, effect.vectorY, effect.maxAmountX,

                  effect.maxAmountY);

}



} // namespace android::compositionengine::impl