diff options
| author | Owen Lin <owenlin@google.com> | 2012-05-02 03:08:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-02 03:08:51 -0700 |
| commit | 603f9090bed0908374eda827be2c08a7a1b8d8c2 (patch) | |
| tree | e8f18a903152b082745938a0b7bae982d4e3769e /src | |
| parent | 0820262bea846c466706ab488d038747ddcdd747 (diff) | |
| parent | 5548396020eed79dde29f33fa68d4d593b9dd013 (diff) | |
| download | android_packages_apps_Gallery2-603f9090bed0908374eda827be2c08a7a1b8d8c2.tar.gz android_packages_apps_Gallery2-603f9090bed0908374eda827be2c08a7a1b8d8c2.tar.bz2 android_packages_apps_Gallery2-603f9090bed0908374eda827be2c08a7a1b8d8c2.zip | |
Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/ui/TileImageView.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/com/android/gallery3d/ui/TileImageView.java b/src/com/android/gallery3d/ui/TileImageView.java index eb5da891a..7e811fc05 100644 --- a/src/com/android/gallery3d/ui/TileImageView.java +++ b/src/com/android/gallery3d/ui/TileImageView.java @@ -232,20 +232,20 @@ public class TileImageView extends GLView { mDecodeQueue.clean(); mUploadQueue.clean(); mBackgroundTileUploaded = false; - } - // Recycle unused tiles: if the level of the active tile is outside the - // range [fromLevel, endLevel) or not in the visible range. - int n = mActiveTiles.size(); - for (int i = 0; i < n; i++) { - Tile tile = mActiveTiles.valueAt(i); - int level = tile.mTileLevel; - if (level < fromLevel || level >= endLevel - || !range[level - fromLevel].contains(tile.mX, tile.mY)) { - mActiveTiles.removeAt(i); - i--; - n--; - recycleTile(tile); + // Recycle unused tiles: if the level of the active tile is outside the + // range [fromLevel, endLevel) or not in the visible range. + int n = mActiveTiles.size(); + for (int i = 0; i < n; i++) { + Tile tile = mActiveTiles.valueAt(i); + int level = tile.mTileLevel; + if (level < fromLevel || level >= endLevel + || !range[level - fromLevel].contains(tile.mX, tile.mY)) { + mActiveTiles.removeAt(i); + i--; + n--; + recycleTile(tile); + } } } |
