From e32915d3ad832b7245e64a5df08dedf99474def4 Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Fri, 5 Oct 2012 18:01:21 +0800
Subject: Fix ANR in creating the fallback animation.

bug: 6620501
Change-Id: Ibb798cce5dd49bb5083de6f29225bae512d589f8
---
 src/com/android/gallery3d/ui/GLRootView.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/android/gallery3d/ui/GLRootView.java b/src/com/android/gallery3d/ui/GLRootView.java
index 390d58737..dbdfb6716 100644
--- a/src/com/android/gallery3d/ui/GLRootView.java
+++ b/src/com/android/gallery3d/ui/GLRootView.java
@@ -465,14 +465,15 @@ public class GLRootView extends GLSurfaceView
                 listener = mIdleListeners.removeFirst();
             }
             mRenderLock.lock();
+            boolean keepInQueue;
             try {
-                if (!listener.onGLIdle(mCanvas, mRenderRequested)) return;
+                keepInQueue = listener.onGLIdle(mCanvas, mRenderRequested);
             } finally {
                 mRenderLock.unlock();
             }
             synchronized (mIdleListeners) {
-                mIdleListeners.addLast(listener);
-                if (!mRenderRequested) enable();
+                if (keepInQueue) mIdleListeners.addLast(listener);
+                if (!mRenderRequested && !mIdleListeners.isEmpty()) enable();
             }
         }
 
-- 
cgit v1.2.3