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

Commit 2900116e authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Remove stray log"

parents ddb9d0be ad1daaa8

libs/hwui/DisplayListRenderer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -599,7 +599,6 @@ bool DisplayList::replay(OpenGLRenderer& renderer, Rect& dirty, int32_t flags, u 
                continue;

            } else {

                op &= ~OP_MAY_BE_SKIPPED_MASK;

                ALOGD("%s", OP_NAMES[op]);

            }

        }

        logBuffer.writeCommand(level, op);

libs/hwui/DisplayListRenderer.h

+5 −3
Original line number Diff line number Diff line
@@ -391,8 +391,9 @@ private: 
        mHasDrawOps = mHasDrawOps || drawOp >= DisplayList::DrawDisplayList;

        if (reject) {

            mWriter.writeInt(OP_MAY_BE_SKIPPED_MASK | drawOp);

            mWriter.writeInt(0);

            uint32_t* location = reject ? mWriter.peek32(mWriter.size() - 4) : NULL;

            mWriter.writeInt(0xdeaddead);

            uint32_t* location = reject ?

                    mWriter.peek32(mWriter.size() - sizeof(int32_t)) : NULL;

            return location;

        }

        mWriter.writeInt(drawOp);
@@ -401,7 +402,8 @@ private: 


    inline void addSkip(uint32_t* location) {

        if (location) {

            *location = (int32_t) (mWriter.peek32(mWriter.size() - 4) - location);

            *location = (int32_t) (mWriter.peek32(

                    mWriter.size() - sizeof(int32_t)) - location);

        }

    }