diff options
| author | Chris Craik <ccraik@google.com> | 2014-12-11 22:49:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 22:49:46 +0000 |
| commit | 00905a984c07ffc9960ce83548631c59aae37ec6 (patch) | |
| tree | 360001ec6ec6daf704e3440024e2ff2d98922e3c /libs | |
| parent | 922f8e2c0f58e57d02ab136f24f135553e6d9720 (diff) | |
| parent | 63c7b24645d94c92dc6dc32d57c23b5167950c8b (diff) | |
| download | frameworks_base-00905a984c07ffc9960ce83548631c59aae37ec6.zip frameworks_base-00905a984c07ffc9960ce83548631c59aae37ec6.tar.gz frameworks_base-00905a984c07ffc9960ce83548631c59aae37ec6.tar.bz2 | |
am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev
* commit '63c7b24645d94c92dc6dc32d57c23b5167950c8b':
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 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, |