am d1314e75: am 603f9090: Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev

* commit 'd1314e754bfb077ec868848c5b0a639ac2d9a60e':
  Fix a issue that we are trying upload a recycled tile.

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);
+                }
             }
         }