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

Commit 88edd7ca authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6570104 from 32ca5feb to rvc-release 

Change-Id: I0f6bca8c954845d5800d4a6fbf68ad29abc5626d
parents 21f2f81e 32ca5feb

libs/gui/ISurfaceComposer.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -691,8 +691,7 @@ public: 
        return result;

        return result;

    }

    }





    virtual status_t getLayerDebugInfo(std::vector<LayerDebugInfo>* outLayers) const

    virtual status_t getLayerDebugInfo(std::vector<LayerDebugInfo>* outLayers) {

    {

        if (!outLayers) {

        if (!outLayers) {

            return UNEXPECTED_NULL;

            return UNEXPECTED_NULL;

        }

        }

libs/gui/include/gui/ISurfaceComposer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -354,7 +354,7 @@ public: 
     *

     *

     * Requires the ACCESS_SURFACE_FLINGER permission.

     * Requires the ACCESS_SURFACE_FLINGER permission.

     */

     */

    virtual status_t getLayerDebugInfo(std::vector<LayerDebugInfo>* outLayers) const = 0;

    virtual status_t getLayerDebugInfo(std::vector<LayerDebugInfo>* outLayers) = 0;





    virtual status_t getColorManagement(bool* outGetColorManagement) const = 0;

    virtual status_t getColorManagement(bool* outGetColorManagement) const = 0;

libs/gui/tests/Surface_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -785,7 +785,7 @@ public: 
        return NO_ERROR;

        return NO_ERROR;

    }

    }

    status_t injectVSync(nsecs_t /*when*/) override { return NO_ERROR; }

    status_t injectVSync(nsecs_t /*when*/) override { return NO_ERROR; }

    status_t getLayerDebugInfo(std::vector<LayerDebugInfo>* /*layers*/) const override {

    status_t getLayerDebugInfo(std::vector<LayerDebugInfo>* /*layers*/) override {

        return NO_ERROR;

        return NO_ERROR;

    }

    }

    status_t getCompositionPreference(

    status_t getCompositionPreference(

services/gpuservice/GpuService.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,6 @@ status_t GpuService::doDump(int fd, const Vector<String16>& args, bool /*asProto 
        size_t numArgs = args.size();

        size_t numArgs = args.size();





        if (numArgs) {

        if (numArgs) {

            dumpAll = false;

            for (size_t index = 0; index < numArgs; ++index) {

            for (size_t index = 0; index < numArgs; ++index) {

                if (args[index] == String16("--gpustats")) {

                if (args[index] == String16("--gpustats")) {

                    dumpStats = true;

                    dumpStats = true;
@@ -102,6 +101,7 @@ status_t GpuService::doDump(int fd, const Vector<String16>& args, bool /*asProto 
                    dumpDriverInfo = true;

                    dumpDriverInfo = true;

                }

                }

            }

            }

            dumpAll = !(dumpDriverInfo || dumpStats);

        }

        }





        if (dumpAll || dumpDriverInfo) {

        if (dumpAll || dumpDriverInfo) {

services/surfaceflinger/Layer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1501,7 +1501,7 @@ LayerDebugInfo Layer::getLayerDebugInfo(const DisplayDevice* display) const { 
    LayerDebugInfo info;

    LayerDebugInfo info;

    const State& ds = getDrawingState();

    const State& ds = getDrawingState();

    info.mName = getName();

    info.mName = getName();

    sp<Layer> parent = getParent();

    sp<Layer> parent = mDrawingParent.promote();

    info.mParentName = parent ? parent->getName() : "none"s;

    info.mParentName = parent ? parent->getName() : "none"s;

    info.mType = getType();

    info.mType = getType();

    info.mTransparentRegion = ds.activeTransparentRegion_legacy;

    info.mTransparentRegion = ds.activeTransparentRegion_legacy;