summaryrefslogtreecommitdiff
path: root/libs/hwui/Caches.cpp
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2014-11-03 18:50:10 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-11-03 18:50:10 +0000
commit6398d2d42e20b751509ba1c60632bf6cf61a6b71 (patch)
tree840585bb82cc41ca1d4bf4baff7ce43d428d42ec /libs/hwui/Caches.cpp
parent9b40ce39f79a9c60aac4ec5b578aa81f60322aef (diff)
parent8a8a40556ea3b0fb4cc8cd1ec063fb9988db497f (diff)
am 8a8a4055: am 541641d0: Merge "Fix counting" into lmp-mr1-dev automerge: 5c8d135
* commit '8a8a40556ea3b0fb4cc8cd1ec063fb9988db497f': Fix counting
Diffstat (limited to 'libs/hwui/Caches.cpp')
-rw-r--r--libs/hwui/Caches.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index b313612ec3a1..23635fd156e6 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -281,7 +281,7 @@ void Caches::dumpMemoryUsage(String8 &log) {
layer->getWidth(), layer->getHeight(),
layer->isTextureLayer(), layer->getTexture(),
layer->getFbo(), layer->getStrongCount());
- memused = layer->getWidth() * layer->getHeight() * 4;
+ memused += layer->getWidth() * layer->getHeight() * 4;
}
log.appendFormat(" Layers total %8d (numLayers = %zu)\n",
memused, mRenderState->mActiveLayers.size());