Make sure we won't upload recycled bitmap.

bug: 6465117
Change-Id: I97553ba9da0256cfedde3a5752224380b1a3ee6f

3 files changed, 12 insertions, 9 deletions

diff --git a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
index 7fa7df48a..cefb9cd8a 100644
--- a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
+++ b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
@@ -389,6 +389,7 @@ public class AlbumSetSlidingWindow implements AlbumSetDataLoader.DataListener {
 
     public void pause() {
         mIsActive = false;
+        mTextureUploader.clear();
         for (int i = mContentStart, n = mContentEnd; i < n; ++i) {
             freeSlotContent(i);
         }
diff --git a/src/com/android/gallery3d/ui/AlbumSlidingWindow.java b/src/com/android/gallery3d/ui/AlbumSlidingWindow.java
index bc6f7385d..240cf34e2 100644
--- a/src/com/android/gallery3d/ui/AlbumSlidingWindow.java
+++ b/src/com/android/gallery3d/ui/AlbumSlidingWindow.java
@@ -341,6 +341,7 @@ public class AlbumSlidingWindow implements AlbumDataLoader.DataListener {
 
     public void pause() {
         mIsActive = false;
+        mTextureUploader.clear();
         for (int i = mContentStart, n = mContentEnd; i < n; ++i) {
             freeSlotContent(i);
         }
diff --git a/src/com/android/gallery3d/ui/TextureUploader.java b/src/com/android/gallery3d/ui/TextureUploader.java
index b651c69a4..ff7830fa2 100644
--- a/src/com/android/gallery3d/ui/TextureUploader.java
+++ b/src/com/android/gallery3d/ui/TextureUploader.java
@@ -64,17 +64,18 @@ public class TextureUploader implements OnGLIdleListener {
             synchronized (this) {
                 if (deque.isEmpty()) break;
                 t = deque.removeFirst();
-            }
-            if (!t.isContentValid(canvas)) {
+                if (t.isContentValid(canvas)) continue;
+                // this has to be protected by the synchronized block
+                // to prevent the inner bitmap get recycled
                 t.updateContent(canvas);
-
-                // It will took some more time for a texture to be drawn for
-                // the first time.
-                // Thus, when scrolling, if a new column appears on screen,
-                // it may cause a UI jank even these textures are uploaded.
-                if (isBackground) t.draw(canvas, 0, 0);
-                --uploadQuota;
             }
+
+            // It will took some more time for a texture to be drawn for
+            // the first time.
+            // Thus, when scrolling, if a new column appears on screen,
+            // it may cause a UI jank even these textures are uploaded.
+            if (isBackground) t.draw(canvas, 0, 0);
+            --uploadQuota;
         }
         return uploadQuota;
     }