diff options
| author | Chris Craik <ccraik@google.com> | 2014-12-12 04:25:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-12 04:25:43 +0000 |
| commit | 3f454e7d1cf7103e312f67f745f01f00fa49df13 (patch) | |
| tree | 98012eb43a2c47674a47f9383d29638a27f6e8da /libs | |
| parent | 2d6627a9f28c5c31fec5da3dcf48d96ff7a0d893 (diff) | |
| parent | 00905a984c07ffc9960ce83548631c59aae37ec6 (diff) | |
| download | frameworks_base-3f454e7d1cf7103e312f67f745f01f00fa49df13.zip frameworks_base-3f454e7d1cf7103e312f67f745f01f00fa49df13.tar.gz frameworks_base-3f454e7d1cf7103e312f67f745f01f00fa49df13.tar.bz2 | |
am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev
automerge: 00905a9
* commit '00905a984c07ffc9960ce83548631c59aae37ec6':
Correct layer size formatting in trace
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index a349ed6..288899d 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, |