1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/ui/TiledScreenNail.java b/src/com/android/gallery3d/ui/TiledScreenNail.java
index d2b34e3bf..74665f584 100644
--- a/src/com/android/gallery3d/ui/TiledScreenNail.java
+++ b/src/com/android/gallery3d/ui/TiledScreenNail.java
@@ -189,6 +189,10 @@ public class TiledScreenNail implements ScreenNail {
     }
 
     public boolean isAnimating() {
+        // The TiledTexture may not be uploaded completely yet.
+        // In that case, we count it as animating state and we will draw
+        // the placeholder in TileImageView.
+        if (mTexture == null || !mTexture.isReady()) return true;
         if (mAnimationStartTime < 0) return false;
         if (AnimationTime.get() - mAnimationStartTime >= DURATION) {
             mAnimationStartTime = ANIMATION_DONE;