commit a1c3fdfbc7a8f271f916b89e721e4d371f1dfe8f
author Chris Craik <ccraik@google.com> Fri Dec 12 04:30:44 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 12 04:30:44 2014 +0000
tree c38ecf73a9a4c5b64a9ca14e060edfac2d87a555
parent 10c9c6681554ab7ae0a322c95ba99574d6917962
parent 3f454e7d1cf7103e312f67f745f01f00fa49df13

am 3f454e7d: am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev automerge: 00905a9

* commit '3f454e7d1cf7103e312f67f745f01f00fa49df13':
  Correct layer size formatting in trace

libs/hwui/RenderNode.cpp

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index e7cbacd..7931b35 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -430,9 +430,9 @@
                 clipFlags = 0; // all clipping done by saveLayer
             }
 
-            ATRACE_FORMAT("%s alpha caused %ssaveLayer %ux%u",
+            ATRACE_FORMAT("%s alpha caused %ssaveLayer %dx%d",
                     getName(), clipFlags ? "" : "unclipped ",
-                    layerBounds.getWidth(), layerBounds.getHeight());
+                    (int)layerBounds.getWidth(), (int)layerBounds.getHeight());
 
             SaveLayerOp* op = new (handler.allocator()) SaveLayerOp(
                     layerBounds.left, layerBounds.top, layerBounds.right, layerBounds.bottom,