diff options
author | Bobby Georgescu <georgescu@google.com> | 2013-05-22 18:11:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-22 18:11:25 +0000 |
commit | a5d7a79da64631dccee8858cb646b4cb373039df (patch) | |
tree | 7dd171a96c213b63f56520c5e8afa30e812a7b4d /src | |
parent | 667035cb00787b57a59e737f2af928ceebf918e4 (diff) | |
parent | 430237d7a6f8dd74e03e6c1bae8a03f54ab7cffc (diff) | |
download | android_packages_apps_Snap-a5d7a79da64631dccee8858cb646b4cb373039df.tar.gz android_packages_apps_Snap-a5d7a79da64631dccee8858cb646b4cb373039df.tar.bz2 android_packages_apps_Snap-a5d7a79da64631dccee8858cb646b4cb373039df.zip |
Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
Diffstat (limited to 'src')
-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 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]; |