diff options
author | Bobby Georgescu <georgescu@google.com> | 2013-05-22 16:47:03 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-22 16:47:03 -0700 |
commit | 970c0bdd33978839857d05adc98d014dfdd8ef07 (patch) | |
tree | 73daa9c68b79781dc0e226acf0b000de3c41a7fd /src/com/android/photos/data | |
parent | cbb5de929f1fb2d40d5e2f0d616a2ff3ce3f0f83 (diff) | |
parent | a5d7a79da64631dccee8858cb646b4cb373039df (diff) | |
download | android_packages_apps_Snap-970c0bdd33978839857d05adc98d014dfdd8ef07.tar.gz android_packages_apps_Snap-970c0bdd33978839857d05adc98d014dfdd8ef07.tar.bz2 android_packages_apps_Snap-970c0bdd33978839857d05adc98d014dfdd8ef07.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/data')
-rw-r--r-- | src/com/android/photos/data/GalleryBitmapPool.java | 4 |
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]; |