Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches

1 files changed, 13 insertions, 8 deletions

diff --git a/src/com/android/gallery3d/ui/TiledTexture.java b/src/com/android/gallery3d/ui/TiledTexture.java
index 8598a3fff..2c685bd0f 100644
--- a/src/com/android/gallery3d/ui/TiledTexture.java
+++ b/src/com/android/gallery3d/ui/TiledTexture.java
@@ -164,14 +164,19 @@ public class TiledTexture implements Texture {
         if (mUploadIndex == mTiles.length) return true;
 
         Tile next = mTiles[mUploadIndex++];
-        boolean hasBeenLoad = next.isLoaded();
-        next.updateContent(canvas);
-
-        // It will take some time for a texture to be drawn for the first
-        // time. When scrolling, we need to draw several tiles on the screen
-        // at the same time. It may cause a UI jank even these textures has
-        // been uploaded.
-        if (!hasBeenLoad) next.draw(canvas, 0, 0);
+
+        // Make sure tile has not already been recycled by the time
+        // this is called (race condition in onGLIdle)
+        if (next.bitmap != null) {
+            boolean hasBeenLoad = next.isLoaded();
+            next.updateContent(canvas);
+
+            // It will take some time for a texture to be drawn for the first
+            // time. When scrolling, we need to draw several tiles on the screen
+            // at the same time. It may cause a UI jank even these textures has
+            // been uploaded.
+            if (!hasBeenLoad) next.draw(canvas, 0, 0);
+        }
         return mUploadIndex == mTiles.length;
     }