diff options
| author | 2015-01-29 12:53:38 -0800 | |
|---|---|---|
| committer | 2015-01-29 12:53:38 -0800 | |
| commit | 49bc4acfadf9c5b1e520217278ccb38010d38c89 (patch) | |
| tree | 2731146935070300785f256599ed69a83a9afdab /libs/hwui/Caches.cpp | |
| parent | 293b7b4fe510bf7df879e89bf748c0b8695f4310 (diff) | |
| parent | fe5ac4fc31ee671721f98cf28cf1bd32ac119998 (diff) | |
resolved conflicts for merge of fe5ac4fc to master
Change-Id: I6c0cc82db14b56297586469f940e408c0e218b3b
Diffstat (limited to 'libs/hwui/Caches.cpp')
| -rw-r--r-- | libs/hwui/Caches.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp index dee0dcdebd03..1fb809231bf2 100644 --- a/libs/hwui/Caches.cpp +++ b/libs/hwui/Caches.cpp @@ -250,7 +250,7 @@ void Caches::dumpMemoryUsage(String8 &log) { layerCache.getSize(), layerCache.getMaxSize(), layerCache.getCount()); if (mRenderState) { int memused = 0; - for (std::set<const Layer*>::iterator it = mRenderState->mActiveLayers.begin(); + for (std::set<Layer*>::iterator it = mRenderState->mActiveLayers.begin(); it != mRenderState->mActiveLayers.end(); it++) { const Layer* layer = *it; log.appendFormat(" Layer size %dx%d; isTextureLayer()=%d; texid=%u fbo=%u; refs=%d\n", |