summaryrefslogtreecommitdiffstats
path: root/src/com/android/photos
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2013-05-22 16:47:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-22 16:47:03 -0700
commitdcda3945d663d9bc4d78c8b9d40b6c7ef15d6878 (patch)
tree0b4219341ce47e93a9ee0f5fbdf69ad4d73821bf /src/com/android/photos
parenta41fbbc17d94e1cb883b68d3c5cd1574a466bb66 (diff)
parentcdc87e62ee28b5022b2e4d0bc756c264cc26d8e9 (diff)
downloadandroid_packages_apps_Gallery2-dcda3945d663d9bc4d78c8b9d40b6c7ef15d6878.tar.gz
android_packages_apps_Gallery2-dcda3945d663d9bc4d78c8b9d40b6c7ef15d6878.tar.bz2
android_packages_apps_Gallery2-dcda3945d663d9bc4d78c8b9d40b6c7ef15d6878.zip
am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
* commit 'cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9': Fix potential synchronization issue in bitmap pool
Diffstat (limited to 'src/com/android/photos')
-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 7eb9794c5..390a0d42f 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;
@@ -52,7 +52,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];