Merge "Remove stray log"

Author: Romain Guy

libs/hwui/DisplayListRenderer.cpp

@@ -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

@@ -391,8 +391,9 @@ class DisplayListRenderer: public OpenGLRenderer {
         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 @@ class DisplayListRenderer: public OpenGLRenderer {
 
     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);
         }
     }