commit 970c0bdd33978839857d05adc98d014dfdd8ef07
author Bobby Georgescu <georgescu@google.com> Wed May 22 16:47:03 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 22 16:47:03 2013 -0700
tree 73daa9c68b79781dc0e226acf0b000de3c41a7fd
parent cbb5de929f1fb2d40d5e2f0d616a2ff3ce3f0f83
parent a5d7a79da64631dccee8858cb646b4cb373039df

am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce

* commit 'cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9':
  Fix potential synchronization issue in bitmap pool

src/com/android/photos/data/GalleryBitmapPool.java

diff --git a/src/com/android/photos/data/GalleryBitmapPool.java b/src/com/android/photos/data/GalleryBitmapPool.java
index 7eb9794..390a0d4 100644
--- a/src/com/android/photos/data/GalleryBitmapPool.java
+++ b/src/com/android/photos/data/GalleryBitmapPool.java
@@ -19,7 +19,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.util.Pools.Pool;
-import android.util.Pools.SimplePool;
+import android.util.Pools.SynchronizedPool;
 
 import com.android.photos.data.SparseArrayBitmapPool.Node;
 
@@ -52,7 +52,7 @@
 
     private int mCapacityBytes;
     private SparseArrayBitmapPool [] mPools;
-    private Pool<Node> mSharedNodePool = new SimplePool<Node>(128);
+    private Pool<Node> mSharedNodePool = new SynchronizedPool<Node>(128);
 
     private GalleryBitmapPool(int capacityBytes) {
         mPools = new SparseArrayBitmapPool[3];