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

Commit 3bb52441 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8479861 from 7ebb13d6 to tm-qpr1-release 

Change-Id: I7485a910c7bbf2cf832b9695338eb430206e153b
parents 83f953b0 7ebb13d6

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());

libs/vr/libbroadcastring/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ package { 


cc_library_static {

    name: "libbroadcastring",

    clang: true,



    cflags: [

        "-Wall",

        "-Wextra",

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);

}