commit abe8dfb0e37284395b36420ed62f1a93b99bdaf2
author Jason Sams <jsams@google.com> Thu Mar 13 09:28:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 13 09:28:19 2014 +0000
tree d3991073f15b8526db2208527864ba0284b287a6
parent 444b0c6b72bf508e3a672fe34d0f4b00cfea19f9
parent 0641a5d4b1a3b0675c36f44adb05d0a5e20c3d56

am 0641a5d4: am 7f8a4107: am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter.

* commit '0641a5d4b1a3b0675c36f44adb05d0a5e20c3d56':
  Fix destruction issues relating to AllocationAdapter.

libs/hwui/TextureCache.cpp

diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp
index 54a206b..ad235a9 100644
--- a/libs/hwui/TextureCache.cpp
+++ b/libs/hwui/TextureCache.cpp
@@ -184,7 +184,7 @@
     Mutex::Autolock _l(mLock);
     size_t count = mGarbage.size();
     for (size_t i = 0; i < count; i++) {
-        const SkBitmap* bitmap = mGarbage.itemAt(i);
+        SkBitmap* bitmap = mGarbage.itemAt(i);
         mCache.remove(bitmap);
         delete bitmap;
     }