summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2013-05-22 11:16:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-22 11:16:48 -0700
commite3ea05489d870d9fb0c6c45401e01a07c7b90b4c (patch)
tree8dbd7377f95077d4522dfbf25be98a87a204d6bb /src/com/android
parentdc5c77d6e56171b7f879e9558e491f93b0def3a6 (diff)
parent410635e7f8df429fcecc328bf6191b053b989004 (diff)
downloadandroid_packages_apps_Gallery2-e3ea05489d870d9fb0c6c45401e01a07c7b90b4c.tar.gz
android_packages_apps_Gallery2-e3ea05489d870d9fb0c6c45401e01a07c7b90b4c.tar.bz2
android_packages_apps_Gallery2-e3ea05489d870d9fb0c6c45401e01a07c7b90b4c.zip
am 410635e7: am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
* commit '410635e7f8df429fcecc328bf6191b053b989004': Fix potential synchronization issue in bitmap pool
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/photos/data/GalleryBitmapPool.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/photos/data/GalleryBitmapPool.java b/src/com/android/photos/data/GalleryBitmapPool.java
index a5a17ede2..aca3e4b5c 100644
--- a/src/com/android/photos/data/GalleryBitmapPool.java
+++ b/src/com/android/photos/data/GalleryBitmapPool.java
@@ -19,7 +19,7 @@ package com.android.photos.data;
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;
@@ -36,7 +36,7 @@ public class GalleryBitmapPool {
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];