summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2014-12-11 22:43:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-11 22:43:18 +0000
commit63c7b24645d94c92dc6dc32d57c23b5167950c8b (patch)
treeb4ddc30659c38aaa05c6e6f08327362a90aac6ce /libs
parent72b047c6c37ddf860be15b159b9a143be36d7425 (diff)
parentc2379070a46f208bce490b938e0673ba00373e2e (diff)
downloadframeworks_base-63c7b24645d94c92dc6dc32d57c23b5167950c8b.zip
frameworks_base-63c7b24645d94c92dc6dc32d57c23b5167950c8b.tar.gz
frameworks_base-63c7b24645d94c92dc6dc32d57c23b5167950c8b.tar.bz2
Merge "Correct layer size formatting in trace" into lmp-mr1-dev
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/RenderNode.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 810e487..787ee62 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -429,9 +429,9 @@ void RenderNode::setViewProperties(OpenGLRenderer& renderer, T& handler) {
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,